[PATCH] remove unused CONFIG_DMA_NONPCI

It has been dead since kernel 2.5.18.

diff --git a/arch/alpha/defconfig b/arch/alpha/defconfig
index 1ae2174362820d900d8df132228ae190d68176a4..3632f72edc54ff938ed685722324387277363da0 100644 (file)
--- a/arch/alpha/defconfig
+++ b/arch/alpha/defconfig
@@ -207,7 +207,6 @@ CONFIG_BLK_DEV_CY82C693=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig
index 2a9be5847f0355dcc98ee70ae232983a0878a6ee..1701c6ff7f83a7d5b25db9ed3e773717245a30d3 100644 (file)
--- a/arch/arm/configs/cerfcube_defconfig
+++ b/arch/arm/configs/cerfcube_defconfig
@@ -448,7 +448,6 @@ CONFIG_BLK_DEV_IDECS=m
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig
index a51f15856846557b8301513c88243d2af419edee..c1f0b687114a0b6ab0ad94a3a99eae275a0b82ee 100644 (file)
--- a/arch/arm/configs/lart_defconfig
+++ b/arch/arm/configs/lart_defconfig
@@ -469,7 +469,6 @@ CONFIG_BLK_DEV_IDECD=m
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/arm/configs/netwinder_defconfig b/arch/arm/configs/netwinder_defconfig
index dc115ca6bb62c6ea563f1e15be5e90e744c9c8f8..4ec413887432ec4254cdf1a12927a2c67ab03e64 100644 (file)
--- a/arch/arm/configs/netwinder_defconfig
+++ b/arch/arm/configs/netwinder_defconfig
@@ -463,7 +463,6 @@ CONFIG_BLK_DEV_ADMA=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig
index 5db0802f2effeff9aef37f184dabc399fc09b0e0..9d90fede9a64979a3abdb335e592bae04a4b3fb7 100644 (file)
--- a/arch/arm/configs/shark_defconfig
+++ b/arch/arm/configs/shark_defconfig
@@ -381,7 +381,6 @@ CONFIG_BLK_DEV_IDEFLOPPY=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/arm/configs/trizeps_defconfig b/arch/arm/configs/trizeps_defconfig
index 89059c63257ab3780bca3a7a24396cfd2fec3044..c2415315f218ca351c13c3db7eb17c1b0295ddc9 100644 (file)
--- a/arch/arm/configs/trizeps_defconfig
+++ b/arch/arm/configs/trizeps_defconfig
@@ -493,7 +493,6 @@ CONFIG_BLK_DEV_IDECS=m
 # CONFIG_BLK_DEV_IDE_RAPIDE is not set
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 
 #
 # SCSI support

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index e3e91997eabdd0e202372ed71c728402f62f93b5..d7cea320a4159495d2cacbe8dfa90469796723b6 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -304,7 +304,6 @@ CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig
index 2da33c9dd524076f59b81fadecbcd54962bfccdf..d7612bd9a11a517f9adbe9cc4b839568b4932767 100644 (file)
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -214,7 +214,6 @@ CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index 666b2cf961bf65727258edc93acbad9595ca5e9e..8e790347d14a0707e0e2dc7d4d614e57f7d06e0d 100644 (file)
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -221,7 +221,6 @@ CONFIG_BLK_DEV_SGIIOC4=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 815ba2771f9810f270428b93e11e8d010ee8bc84..29f1aa66f107324cc3d5fe71dc5ab0db8097d0e8 100644 (file)
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -211,7 +211,6 @@ CONFIG_BLK_DEV_CMD64X=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index f839a337d999b953cdf51fa29f4e21edfa8a46bb..5020e8bf49d659abd377c25e98f528e055bf78e4 100644 (file)
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -218,7 +218,6 @@ CONFIG_BLK_DEV_SIIMAGE=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index f48afe111b0985ac24457c5c92cc725c72deec74..59e065f1ae97a463275fe1419355bddef2712e28 100644 (file)
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -196,7 +196,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 15d9689b1ba9554c3f2847bc658aaf75e69a9e85..91f58b9930e31bf77de59ad666a72f8e6d5ca12c 100644 (file)
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -189,7 +189,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 20a8107db502a436c370a28af9e9c6d9905dac72..0e890d112b9d29c95b427a2bc61f166abade0f57 100644 (file)
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -268,7 +268,6 @@ CONFIG_BLK_DEV_IDECS=m
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index 1411e5162509bdb3d0c000378e0ee79baf0c6e1f..e6e3879f4f96789f3c0fee77d49d7b9ece4721ff 100644 (file)
--- a/arch/mips/configs/ddb5476_defconfig
+++ b/arch/mips/configs/ddb5476_defconfig
@@ -188,7 +188,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 549806683c59cf12e1122eec72eb4b5406651a27..3e9f7e82a4177ddd3579def7facaf4b0f9c864f1 100644 (file)
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -188,7 +188,6 @@ CONFIG_IDE_TASKFILE_IO=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/eagle_defconfig b/arch/mips/configs/eagle_defconfig
index 9cab87974e3162daa6f6331ae2c9a788a4bc65b4..0bb084e091b3dff3c5016f8df9bd3c5910480efb 100644 (file)
--- a/arch/mips/configs/eagle_defconfig
+++ b/arch/mips/configs/eagle_defconfig
@@ -273,7 +273,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/hp-lj_defconfig b/arch/mips/configs/hp-lj_defconfig
index 47836bfdea46f04937fa398873541ad6a52d8874..9b7e7b7458d04090ddcc39315d8b82a657b45eeb 100644 (file)
--- a/arch/mips/configs/hp-lj_defconfig
+++ b/arch/mips/configs/hp-lj_defconfig
@@ -245,7 +245,6 @@ CONFIG_IDE_TASKFILE_IO=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig
index a129a2f53825d9db1fe31487ad247394824d6518..79a7ab581bc3a90fd48bf14bbdf7b338240d3f7c 100644 (file)
--- a/arch/mips/configs/it8172_defconfig
+++ b/arch/mips/configs/it8172_defconfig
@@ -243,7 +243,6 @@ CONFIG_IDE_TASKFILE_IO=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig
index 2c81265918af3c97db0484ce7c5576b4bda692b4..63c6c168e021a4fe643cda569dc690661fcd8569 100644 (file)
--- a/arch/mips/configs/ivr_defconfig
+++ b/arch/mips/configs/ivr_defconfig
@@ -191,7 +191,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 4d411c766ff5ebddafc18162067cc05a28158604..24a0e49b7c36d2eaeab6dd834a0354ce06e01aac 100644 (file)
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -284,7 +284,6 @@ CONFIG_BLK_DEV_CMD64X=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index c51eaa38b11ef0acb110cabdf4a999853738f6d8..b0de946cf71df18f00684d507900b750a102f4f9 100644 (file)
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -251,7 +251,6 @@ CONFIG_BLK_DEV_HPT366=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index 319b9d9392d6ec7170c900dca8e6dfc22efd7715..a2b34f8d0ee82fe98968b917ad0dcb3798e619e8 100644 (file)
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -192,7 +192,6 @@ CONFIG_IDE_TASKFILE_IO=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 993b7df495986349fed9c7a8de44aa706107b044..6c55146cb69c1ca045f29fab7de494eeed8bc9b3 100644 (file)
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -188,7 +188,6 @@ CONFIG_IDE_TASKFILE_IO=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig
index 1f8d98bf14893dd44c6c066304e4a9d22f75f16f..1ad8604937b59fae286106cb51a6545f1567d186 100644 (file)
--- a/arch/parisc/configs/c3000_defconfig
+++ b/arch/parisc/configs/c3000_defconfig
@@ -186,7 +186,6 @@ CONFIG_BLK_DEV_SIIMAGE=m
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc/configs/common_defconfig b/arch/ppc/configs/common_defconfig
index c6ac04c62f78427cf5e109aee78993514bd1485b..1376107a6867a042195d18197eed128d9e8f9d2c 100644 (file)
--- a/arch/ppc/configs/common_defconfig
+++ b/arch/ppc/configs/common_defconfig
@@ -241,7 +241,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc/configs/cpci405_defconfig b/arch/ppc/configs/cpci405_defconfig
index ce90cd4b5a8254335eac19dec0e6bba02f31029a..c3e992afdd7e9c81487e28227c8fc7f96714cae0 100644 (file)
--- a/arch/ppc/configs/cpci405_defconfig
+++ b/arch/ppc/configs/cpci405_defconfig
@@ -177,7 +177,6 @@ CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc/configs/pmac_defconfig b/arch/ppc/configs/pmac_defconfig
index d4151777e3521b20219a7470476d145e22ab5afa..18b511ba3287c16d43f5589d9f89708021f97c2a 100644 (file)
--- a/arch/ppc/configs/pmac_defconfig
+++ b/arch/ppc/configs/pmac_defconfig
@@ -247,7 +247,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc/configs/pplus_defconfig b/arch/ppc/configs/pplus_defconfig
index b72063c9b748b4d6c44bc9e9a65ad8f36d991448..b26d5085725fe6fec13f081f25ed70d115d9151d 100644 (file)
--- a/arch/ppc/configs/pplus_defconfig
+++ b/arch/ppc/configs/pplus_defconfig
@@ -180,7 +180,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc/configs/redwood5_defconfig b/arch/ppc/configs/redwood5_defconfig
index a5c6432b612e5d6275b54d92245e6091cfe2bb82..5e19714acd2e3e276a9158e4cadf094fbca4ed69 100644 (file)
--- a/arch/ppc/configs/redwood5_defconfig
+++ b/arch/ppc/configs/redwood5_defconfig
@@ -173,7 +173,6 @@ CONFIG_BLK_DEV_IDEDISK=y
 #
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc/defconfig b/arch/ppc/defconfig
index ec1e609bcc10cc0dcce2463ec241b771ccfe6271..ca8f8a2687106711c3162489105dfee4b7becc4e 100644 (file)
--- a/arch/ppc/defconfig
+++ b/arch/ppc/defconfig
@@ -248,7 +248,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig
index 2230b43119a4b4c06e8989adcfd4ccd28a518160..c5739bf3cb4a36d22bc8b379d2bf4a10ee9ff490 100644 (file)
--- a/arch/ppc64/configs/g5_defconfig
+++ b/arch/ppc64/configs/g5_defconfig
@@ -195,7 +195,6 @@ CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig
index af80676e2dc4ad5387ef481f47b10d2801494f9c..280ca7fb40a650501762a62af1def5d58d3af7c5 100644 (file)
--- a/arch/ppc64/configs/pSeries_defconfig
+++ b/arch/ppc64/configs/pSeries_defconfig
@@ -197,7 +197,6 @@ CONFIG_BLK_DEV_AMD74XX=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig
index af80676e2dc4ad5387ef481f47b10d2801494f9c..280ca7fb40a650501762a62af1def5d58d3af7c5 100644 (file)
--- a/arch/ppc64/defconfig
+++ b/arch/ppc64/defconfig
@@ -197,7 +197,6 @@ CONFIG_BLK_DEV_AMD74XX=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/sh/defconfig b/arch/sh/defconfig
index ec6ea5496a055532b0b20f0e980f1f90ae2afb59..44ec26ea5505352f41a60acb1a24fee6c101e050 100644 (file)
--- a/arch/sh/defconfig
+++ b/arch/sh/defconfig
@@ -152,7 +152,6 @@ CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 43842a7f13e4ea86f311a3c52689138fee6b825d..4feeb5fb628079e1bb1a79be4b370a120f090cf5 100644 (file)
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -277,7 +277,6 @@ CONFIG_BLK_DEV_VIA82CXXX=m
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index c010a255f92a145a8b207968b9ca08a0ab3a701e..c4e3ccd82d1bd784eab0ba202a79b0105ec99737 100644 (file)
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -235,7 +235,6 @@ CONFIG_BLK_DEV_PIIX=y
 CONFIG_BLK_DEV_IDEDMA=y
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_IDEDMA_AUTO=y
-# CONFIG_DMA_NONPCI is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 1755d50714f6c803fcafc88b29d434edc9527446..eb943429b0b80028e0825b7d6b420b2364eb5605 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -829,10 +829,10 @@ int ide_config_drive_speed (ide_drive_t *drive, u8 speed)
 //     while (HWGROUP(drive)->busy)
 //             ide_delay_50ms();
 
-#if defined(CONFIG_BLK_DEV_IDEDMA) && !defined(CONFIG_DMA_NONPCI)
+#ifdef CONFIG_BLK_DEV_IDEDMA
        if (hwif->ide_dma_check)         /* check if host supports DMA */
                hwif->ide_dma_host_off(drive);
-#endif /* (CONFIG_BLK_DEV_IDEDMA) && !(CONFIG_DMA_NONPCI) */
+#endif
 
        /*
         * Don't use ide_wait_cmd here - it will
@@ -906,14 +906,12 @@ int ide_config_drive_speed (ide_drive_t *drive, u8 speed)
        drive->id->dma_mword &= ~0x0F00;
        drive->id->dma_1word &= ~0x0F00;
 
-#if defined(CONFIG_BLK_DEV_IDEDMA) && !defined(CONFIG_DMA_NONPCI)
-       if (speed >= XFER_SW_DMA_0) {
+#ifdef CONFIG_BLK_DEV_IDEDMA
+       if (speed >= XFER_SW_DMA_0)
                hwif->ide_dma_host_on(drive);
-       } else {
-               if (hwif->ide_dma_check) /* check if host supports DMA */
-                       hwif->ide_dma_off_quietly(drive);
-       }
-#endif /* (CONFIG_BLK_DEV_IDEDMA) && !(CONFIG_DMA_NONPCI) */
+       else if (hwif->ide_dma_check)   /* check if host supports DMA */
+               hwif->ide_dma_off_quietly(drive);
+#endif
 
        switch(speed) {
                case XFER_UDMA_7:   drive->id->dma_ultra |= 0x8080; break;

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 6ece03937c3f56959e72ef3cb6f9ceee52f48324..135f0d89eadef9c21c04329662f5190332b8a980 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -737,7 +737,6 @@ void ide_unregister (unsigned int index)
        unregister_blkdev(hwif->major, hwif->name);
        spin_lock_irq(&ide_lock);
 
-#if !defined(CONFIG_DMA_NONPCI)
        if (hwif->dma_base) {
                (void) ide_release_dma(hwif);
 
@@ -749,7 +748,7 @@ void ide_unregister (unsigned int index)
                hwif->dma_vendor3 = 0;
                hwif->dma_prdtable = 0;
        }
-#endif /* !(CONFIG_DMA_NONPCI) */
+
        old_hwif                        = *hwif;
        init_hwif_data(index);  /* restore hwif data to pristine status */
        hwif->hwgroup                   = old_hwif.hwgroup;
@@ -2424,10 +2423,8 @@ void cleanup_module (void)
 
        for (index = 0; index < MAX_HWIFS; ++index) {
                ide_unregister(index);
-#if !defined(CONFIG_DMA_NONPCI)
                if (ide_hwifs[index].dma_base)
                        (void) ide_release_dma(&ide_hwifs[index]);
-#endif /* !(CONFIG_DMA_NONPCI) */
        }
 
 #ifdef CONFIG_PROC_FS