From 61310117f5fa0e768add00367a92da73796675b3 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 4 Feb 2004 20:39:00 -0800 Subject: [PATCH] [PATCH] remove CONFIG_IDEDMA_PCI_WIP Fix CONFIG_HPT34X_AUTODMA to depend directly on CONFIG_EXPERIMENTAL and finally remove CONFIG_IDEDMA_PCI_WIP. --- arch/alpha/defconfig | 1 - arch/arm/configs/iq80321_defconfig | 1 - arch/arm/configs/netwinder_defconfig | 1 - arch/i386/defconfig | 1 - arch/ia64/configs/generic_defconfig | 1 - arch/ia64/configs/sn2_defconfig | 1 - arch/ia64/defconfig | 1 - arch/mips/defconfig-lasat200 | 1 - arch/ppc/configs/common_defconfig | 1 - arch/ppc/configs/pmac_defconfig | 1 - arch/ppc/defconfig | 1 - arch/sparc64/defconfig | 1 - arch/x86_64/defconfig | 1 - drivers/ide/Kconfig | 14 ++------------ 14 files changed, 2 insertions(+), 25 deletions(-) diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig index 32a8530a63905..1013d707b5db3 100644 --- a/arch/alpha/defconfig +++ b/arch/alpha/defconfig @@ -155,7 +155,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set CONFIG_BLK_DEV_ALI15X3=y diff --git a/arch/arm/configs/iq80321_defconfig b/arch/arm/configs/iq80321_defconfig index c84b6b1b89855..456dbbb080e03 100644 --- a/arch/arm/configs/iq80321_defconfig +++ b/arch/arm/configs/iq80321_defconfig @@ -441,7 +441,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/arm/configs/netwinder_defconfig b/arch/arm/configs/netwinder_defconfig index 33b0f9bf40819..a9746196ab4a2 100644 --- a/arch/arm/configs/netwinder_defconfig +++ b/arch/arm/configs/netwinder_defconfig @@ -439,7 +439,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 8f2ebb733c59b..7905c3fe6cf4d 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig @@ -274,7 +274,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index 983d799814be3..745a5652f5306 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -191,7 +191,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 5c755d73a73dd..719def026a560 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig @@ -170,7 +170,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 5456e54fd86e3..bc4a1e3c157f7 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig @@ -188,7 +188,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/mips/defconfig-lasat200 b/arch/mips/defconfig-lasat200 index 38b02f2a3edc8..0f2e9502b183b 100644 --- a/arch/mips/defconfig-lasat200 +++ b/arch/mips/defconfig-lasat200 @@ -254,7 +254,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig index ac024498ccd26..c6ac04c62f784 100644 --- a/arch/ppc/configs/common_defconfig +++ b/arch/ppc/configs/common_defconfig @@ -210,7 +210,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/ppc/configs/pmac_defconfig b/arch/ppc/configs/pmac_defconfig index a07b29bf49c56..d4151777e3521 100644 --- a/arch/ppc/configs/pmac_defconfig +++ b/arch/ppc/configs/pmac_defconfig @@ -217,7 +217,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig index b061b110b953c..ec1e609bcc10c 100644 --- a/arch/ppc/defconfig +++ b/arch/ppc/defconfig @@ -218,7 +218,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 3099188d1851f..f19d4dbf5a49c 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -242,7 +242,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y CONFIG_IDEDMA_ONLYDISK=y -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set CONFIG_BLK_DEV_ALI15X3=y diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 2f59cc164daee..55e21c86a734e 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig @@ -191,7 +191,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y # CONFIG_BLK_DEV_IDEDMA_FORCED is not set CONFIG_IDEDMA_PCI_AUTO=y # CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_IDEDMA_PCI_WIP is not set CONFIG_BLK_DEV_ADMA=y # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index ad58b6d61d501..33be981a06f0a 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -511,16 +511,6 @@ config IDEDMA_ONLYDISK Generally say N here. -config IDEDMA_PCI_WIP - bool "ATA Work(s) In Progress (EXPERIMENTAL)" - depends on EXPERIMENTAL - help - If you enable this you will be able to use and test highly - developmental projects. If you say N, the configurator will - simply skip those options. - - It is SAFEST to say N to this question. - config BLK_DEV_ADMA bool depends on PCI && BLK_DEV_IDEPCI @@ -619,8 +609,8 @@ config BLK_DEV_HPT34X DVD II drives, by the manufacturer. config HPT34X_AUTODMA - bool "HPT34X AUTODMA support (WIP)" - depends on BLK_DEV_HPT34X && IDEDMA_PCI_WIP + bool "HPT34X AUTODMA support (EXPERIMENTAL)" + depends on BLK_DEV_HPT34X && EXPERIMENTAL help This is a dangerous thing to attempt currently! Please read the comments at the top of . If you say Y -- 2.53.0