[PATCH] remove CONFIG_IDEDMA_PCI_WIP

Fix CONFIG_HPT34X_AUTODMA to depend directly on CONFIG_EXPERIMENTAL
and finally remove CONFIG_IDEDMA_PCI_WIP.

diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig
index 32a8530a63905b75e3f858f98ff06ebb59341c00..1013d707b5db32e219c3bdf295d5085ba48c8d66 100644 (file)
--- 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 c84b6b1b89855e87f0d2a9214dd770ae62d86ca9..456dbbb080e03d45b57e87d6f4180d0fb7b38fe7 100644 (file)
--- 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 33b0f9bf40819bd18a225e5d847f2ed2ffc7f789..a9746196ab4a24a3038829f392d872548994daba 100644 (file)
--- 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 8f2ebb733c59b63135af838424c0783beded12d9..7905c3fe6cf4d618163b2f902dee07f6a0efe644 100644 (file)
--- 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 983d799814be3befe3ad962fc1b406318295fd2f..745a5652f53062f40fe004c31999cadb8376a4f2 100644 (file)
--- 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 5c755d73a73ddd3651c6d8d13be9170df629a2db..719def026a56013ea479b60d7c28355635c5648e 100644 (file)
--- 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 5456e54fd86e3ffe395dfd349e2ab9059ce43c37..bc4a1e3c157f7cbb1b36764af1a95aded841bf66 100644 (file)
--- 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 38b02f2a3edc8e83f6d6836a059e7dca01eef364..0f2e9502b183bb157d88d1681f9b8f61af2b1460 100644 (file)
--- 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 ac024498ccd260ecca83b7de1739c77839b4b31f..c6ac04c62f78427cf5e109aee78993514bd1485b 100644 (file)
--- 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 a07b29bf49c564f10cf8ac9beddf8a4cc861c0bd..d4151777e3521b20219a7470476d145e22ab5afa 100644 (file)
--- 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 b061b110b953cd393b66ba659f26dc9f596fc5ca..ec1e609bcc10cc0dcce2463ec241b771ccfe6271 100644 (file)
--- 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 3099188d1851f94478b3a7edbb8f9f526c87787a..f19d4dbf5a49c147b6c229da58c3771cdb09cbe8 100644 (file)
--- 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 2f59cc164daee917fea856257bc9182b09f296e2..55e21c86a734e9a7cda6900db03066e71038d18d 100644 (file)
--- 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 ad58b6d61d5012318ce953d47e3bb2acd0fbe3c5..33be981a06f0aab58b764f200c94a67de34e9481 100644 (file)
--- 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 <file:drivers/ide/pci/hpt34x.c>.  If you say Y