Commit f057eac0 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ftp.linux.org.uk>
Acked-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 69378381
...@@ -66,6 +66,9 @@ config GENERIC_FIND_NEXT_BIT ...@@ -66,6 +66,9 @@ config GENERIC_FIND_NEXT_BIT
bool bool
default y default y
config ARCH_NO_VIRT_TO_BUS
def_bool PPC64
config PPC config PPC
bool bool
default y default y
......
...@@ -142,7 +142,7 @@ config ATM_ENI_BURST_RX_2W ...@@ -142,7 +142,7 @@ config ATM_ENI_BURST_RX_2W
config ATM_FIRESTREAM config ATM_FIRESTREAM
tristate "Fujitsu FireStream (FS50/FS155) " tristate "Fujitsu FireStream (FS50/FS155) "
depends on PCI depends on PCI && VIRT_TO_BUS
help help
Driver for the Fujitsu FireStream 155 (MB86697) and Driver for the Fujitsu FireStream 155 (MB86697) and
FireStream 50 (MB86695) ATM PCI chips. FireStream 50 (MB86695) ATM PCI chips.
...@@ -152,7 +152,7 @@ config ATM_FIRESTREAM ...@@ -152,7 +152,7 @@ config ATM_FIRESTREAM
config ATM_ZATM config ATM_ZATM
tristate "ZeitNet ZN1221/ZN1225" tristate "ZeitNet ZN1221/ZN1225"
depends on PCI depends on PCI && VIRT_TO_BUS
help help
Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
adapters. adapters.
...@@ -240,7 +240,7 @@ config ATM_IDT77252_USE_SUNI ...@@ -240,7 +240,7 @@ config ATM_IDT77252_USE_SUNI
config ATM_AMBASSADOR config ATM_AMBASSADOR
tristate "Madge Ambassador (Collage PCI 155 Server)" tristate "Madge Ambassador (Collage PCI 155 Server)"
depends on PCI depends on PCI && VIRT_TO_BUS
select BITREVERSE select BITREVERSE
help help
This is a driver for ATMizer based ATM card produced by Madge This is a driver for ATMizer based ATM card produced by Madge
...@@ -265,7 +265,7 @@ config ATM_AMBASSADOR_DEBUG ...@@ -265,7 +265,7 @@ config ATM_AMBASSADOR_DEBUG
config ATM_HORIZON config ATM_HORIZON
tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)" tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
depends on PCI depends on PCI && VIRT_TO_BUS
help help
This is a driver for the Horizon chipset ATM adapter cards once This is a driver for the Horizon chipset ATM adapter cards once
produced by Madge Networks Ltd. Say Y (or M to compile as a module produced by Madge Networks Ltd. Say Y (or M to compile as a module
......
...@@ -113,7 +113,7 @@ source "drivers/block/paride/Kconfig" ...@@ -113,7 +113,7 @@ source "drivers/block/paride/Kconfig"
config BLK_CPQ_DA config BLK_CPQ_DA
tristate "Compaq SMART2 support" tristate "Compaq SMART2 support"
depends on PCI depends on PCI && VIRT_TO_BUS
help help
This is the driver for Compaq Smart Array controllers. Everyone This is the driver for Compaq Smart Array controllers. Everyone
using these boards should say Y here. See the file using these boards should say Y here. See the file
......
...@@ -54,6 +54,7 @@ config I2O_EXT_ADAPTEC_DMA64 ...@@ -54,6 +54,7 @@ config I2O_EXT_ADAPTEC_DMA64
config I2O_CONFIG config I2O_CONFIG
tristate "I2O Configuration support" tristate "I2O Configuration support"
depends on VIRT_TO_BUS
---help--- ---help---
Say Y for support of the configuration interface for the I2O adapters. Say Y for support of the configuration interface for the I2O adapters.
If you have a RAID controller from Adaptec and you want to use the If you have a RAID controller from Adaptec and you want to use the
......
...@@ -61,7 +61,7 @@ config COSA ...@@ -61,7 +61,7 @@ config COSA
# #
config LANMEDIA config LANMEDIA
tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards" tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
depends on PCI depends on PCI && VIRT_TO_BUS
---help--- ---help---
Driver for the following Lan Media family of serial boards: Driver for the following Lan Media family of serial boards:
......
...@@ -545,7 +545,7 @@ config SCSI_HPTIOP ...@@ -545,7 +545,7 @@ config SCSI_HPTIOP
config SCSI_BUSLOGIC config SCSI_BUSLOGIC
tristate "BusLogic SCSI support" tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API && VIRT_TO_BUS
---help--- ---help---
This is support for BusLogic MultiMaster and FlashPoint SCSI Host This is support for BusLogic MultiMaster and FlashPoint SCSI Host
Adapters. Consult the SCSI-HOWTO, available from Adapters. Consult the SCSI-HOWTO, available from
......
...@@ -168,3 +168,7 @@ config NR_QUICK ...@@ -168,3 +168,7 @@ config NR_QUICK
depends on QUICKLIST depends on QUICKLIST
default "2" if (SUPERH && !SUPERH64) default "2" if (SUPERH && !SUPERH64)
default "1" default "1"
config VIRT_TO_BUS
def_bool y
depends on !ARCH_NO_VIRT_TO_BUS
...@@ -348,7 +348,7 @@ config MSND_FIFOSIZE ...@@ -348,7 +348,7 @@ config MSND_FIFOSIZE
config SOUND_VIA82CXXX config SOUND_VIA82CXXX
tristate "VIA 82C686 Audio Codec" tristate "VIA 82C686 Audio Codec"
depends on SOUND_PRIME && PCI && OSS_OBSOLETE depends on SOUND_PRIME && PCI && OSS_OBSOLETE && VIRT_TO_BUS
help help
Say Y here to include support for the audio codec found on VIA Say Y here to include support for the audio codec found on VIA
82Cxxx-based chips. Typically these are built into a motherboard. 82Cxxx-based chips. Typically these are built into a motherboard.
...@@ -368,7 +368,7 @@ config MIDI_VIA82CXXX ...@@ -368,7 +368,7 @@ config MIDI_VIA82CXXX
config SOUND_OSS config SOUND_OSS
tristate "OSS sound modules" tristate "OSS sound modules"
depends on SOUND_PRIME && ISA_DMA_API depends on SOUND_PRIME && ISA_DMA_API && VIRT_TO_BUS
help help
OSS is the Open Sound System suite of sound card drivers. They make OSS is the Open Sound System suite of sound card drivers. They make
sound programming easier since they provide a common API. Say Y or sound programming easier since they provide a common API. Say Y or
...@@ -417,6 +417,7 @@ config SOUND_CS4232 ...@@ -417,6 +417,7 @@ config SOUND_CS4232
config SOUND_SSCAPE config SOUND_SSCAPE
tristate "Ensoniq SoundScape support" tristate "Ensoniq SoundScape support"
depends on SOUND_OSS depends on SOUND_OSS
depends on VIRT_TO_BUS
help help
Answer Y if you have a sound card based on the Ensoniq SoundScape Answer Y if you have a sound card based on the Ensoniq SoundScape
chipset. Such cards are being manufactured at least by Ensoniq, Spea chipset. Such cards are being manufactured at least by Ensoniq, Spea
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment