diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-07-16 02:40:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:42 -0400 |
commit | f057eac0d7ad967138390a9dd7fd8267e1e39d19 (patch) | |
tree | 96e951adb2934ee4495edda09f94c67c02fcf5ab /drivers | |
parent | 693783817a79d8619335e2bf1a33de73cf189864 (diff) |
Introduce CONFIG_VIRT_TO_BUS
Make some offending drivers depend on it and set CONFIG_ARCH_NO_VIRT_TO_BUS
for ppc64 so that we don't build those drivers.
This gets PowerPC allmodconfig and allyesconfig much closer to building.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ftp.linux.org.uk>
Acked-by: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atm/Kconfig | 8 | ||||
-rw-r--r-- | drivers/block/Kconfig | 2 | ||||
-rw-r--r-- | drivers/message/i2o/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/wan/Kconfig | 2 | ||||
-rw-r--r-- | drivers/scsi/Kconfig | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig index 5b4fab24155f..bb4ae6281491 100644 --- a/drivers/atm/Kconfig +++ b/drivers/atm/Kconfig | |||
@@ -142,7 +142,7 @@ config ATM_ENI_BURST_RX_2W | |||
142 | 142 | ||
143 | config ATM_FIRESTREAM | 143 | config ATM_FIRESTREAM |
144 | tristate "Fujitsu FireStream (FS50/FS155) " | 144 | tristate "Fujitsu FireStream (FS50/FS155) " |
145 | depends on PCI | 145 | depends on PCI && VIRT_TO_BUS |
146 | help | 146 | help |
147 | Driver for the Fujitsu FireStream 155 (MB86697) and | 147 | Driver for the Fujitsu FireStream 155 (MB86697) and |
148 | FireStream 50 (MB86695) ATM PCI chips. | 148 | FireStream 50 (MB86695) ATM PCI chips. |
@@ -152,7 +152,7 @@ config ATM_FIRESTREAM | |||
152 | 152 | ||
153 | config ATM_ZATM | 153 | config ATM_ZATM |
154 | tristate "ZeitNet ZN1221/ZN1225" | 154 | tristate "ZeitNet ZN1221/ZN1225" |
155 | depends on PCI | 155 | depends on PCI && VIRT_TO_BUS |
156 | help | 156 | help |
157 | Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM | 157 | Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM |
158 | adapters. | 158 | adapters. |
@@ -240,7 +240,7 @@ config ATM_IDT77252_USE_SUNI | |||
240 | 240 | ||
241 | config ATM_AMBASSADOR | 241 | config ATM_AMBASSADOR |
242 | tristate "Madge Ambassador (Collage PCI 155 Server)" | 242 | tristate "Madge Ambassador (Collage PCI 155 Server)" |
243 | depends on PCI | 243 | depends on PCI && VIRT_TO_BUS |
244 | select BITREVERSE | 244 | select BITREVERSE |
245 | help | 245 | help |
246 | This is a driver for ATMizer based ATM card produced by Madge | 246 | This is a driver for ATMizer based ATM card produced by Madge |
@@ -265,7 +265,7 @@ config ATM_AMBASSADOR_DEBUG | |||
265 | 265 | ||
266 | config ATM_HORIZON | 266 | config ATM_HORIZON |
267 | tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)" | 267 | tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)" |
268 | depends on PCI | 268 | depends on PCI && VIRT_TO_BUS |
269 | help | 269 | help |
270 | This is a driver for the Horizon chipset ATM adapter cards once | 270 | This is a driver for the Horizon chipset ATM adapter cards once |
271 | produced by Madge Networks Ltd. Say Y (or M to compile as a module | 271 | produced by Madge Networks Ltd. Say Y (or M to compile as a module |
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 6e23af1ecbdb..fd7a53bdcb63 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
@@ -113,7 +113,7 @@ source "drivers/block/paride/Kconfig" | |||
113 | 113 | ||
114 | config BLK_CPQ_DA | 114 | config BLK_CPQ_DA |
115 | tristate "Compaq SMART2 support" | 115 | tristate "Compaq SMART2 support" |
116 | depends on PCI | 116 | depends on PCI && VIRT_TO_BUS |
117 | help | 117 | help |
118 | This is the driver for Compaq Smart Array controllers. Everyone | 118 | This is the driver for Compaq Smart Array controllers. Everyone |
119 | using these boards should say Y here. See the file | 119 | using these boards should say Y here. See the file |
diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig index bfa5ece75f64..5afa0e393ecf 100644 --- a/drivers/message/i2o/Kconfig +++ b/drivers/message/i2o/Kconfig | |||
@@ -54,6 +54,7 @@ config I2O_EXT_ADAPTEC_DMA64 | |||
54 | 54 | ||
55 | config I2O_CONFIG | 55 | config I2O_CONFIG |
56 | tristate "I2O Configuration support" | 56 | tristate "I2O Configuration support" |
57 | depends on VIRT_TO_BUS | ||
57 | ---help--- | 58 | ---help--- |
58 | Say Y for support of the configuration interface for the I2O adapters. | 59 | Say Y for support of the configuration interface for the I2O adapters. |
59 | If you have a RAID controller from Adaptec and you want to use the | 60 | If you have a RAID controller from Adaptec and you want to use the |
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig index 4fc8681bc110..a3df09ee729f 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig | |||
@@ -61,7 +61,7 @@ config COSA | |||
61 | # | 61 | # |
62 | config LANMEDIA | 62 | config LANMEDIA |
63 | tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards" | 63 | tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards" |
64 | depends on PCI | 64 | depends on PCI && VIRT_TO_BUS |
65 | ---help--- | 65 | ---help--- |
66 | Driver for the following Lan Media family of serial boards: | 66 | Driver for the following Lan Media family of serial boards: |
67 | 67 | ||
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 9d2119b53ac9..372723161c97 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -545,7 +545,7 @@ config SCSI_HPTIOP | |||
545 | 545 | ||
546 | config SCSI_BUSLOGIC | 546 | config SCSI_BUSLOGIC |
547 | tristate "BusLogic SCSI support" | 547 | tristate "BusLogic SCSI support" |
548 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API | 548 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API && VIRT_TO_BUS |
549 | ---help--- | 549 | ---help--- |
550 | This is support for BusLogic MultiMaster and FlashPoint SCSI Host | 550 | This is support for BusLogic MultiMaster and FlashPoint SCSI Host |
551 | Adapters. Consult the SCSI-HOWTO, available from | 551 | Adapters. Consult the SCSI-HOWTO, available from |