8 files changed, 18 insertions, 9 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 6beee32144c0..6b8b83ebca75 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -66,6 +66,9 @@ config GENERIC_FIND_NEXT_BIT
         bool
         default y
 
+config ARCH_NO_VIRT_TO_BUS
+        def_bool PPC64
+
 config PPC
         bool
         default y
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
 
 config ATM_FIRESTREAM
         tristate "Fujitsu FireStream (FS50/FS155) "
-        depends on PCI
+        depends on PCI && VIRT_TO_BUS
         help
           Driver for the Fujitsu FireStream 155 (MB86697) and
           FireStream 50 (MB86695) ATM PCI chips.
@@ -152,7 +152,7 @@ config ATM_FIRESTREAM
 
 config ATM_ZATM
         tristate "ZeitNet ZN1221/ZN1225"
-        depends on PCI
+        depends on PCI && VIRT_TO_BUS
         help
           Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
           adapters.
@@ -240,7 +240,7 @@ config ATM_IDT77252_USE_SUNI
 
 config ATM_AMBASSADOR
         tristate "Madge Ambassador (Collage PCI 155 Server)"
-        depends on PCI
+        depends on PCI && VIRT_TO_BUS
         select BITREVERSE
         help
           This is a driver for ATMizer based ATM card produced by Madge
@@ -265,7 +265,7 @@ config ATM_AMBASSADOR_DEBUG
 
 config ATM_HORIZON
         tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
-        depends on PCI
+        depends on PCI && VIRT_TO_BUS
         help
           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
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"
 
 config BLK_CPQ_DA
         tristate "Compaq SMART2 support"
-        depends on PCI
+        depends on PCI && VIRT_TO_BUS
         help
           This is the driver for Compaq Smart Array controllers.  Everyone
           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
 
 config I2O_CONFIG
         tristate "I2O Configuration support"
+        depends on VIRT_TO_BUS
         ---help---
           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
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
 #
 config LANMEDIA
         tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
-        depends on PCI
+        depends on PCI && VIRT_TO_BUS
         ---help---
           Driver for the following Lan Media family of serial boards:
 
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
 
 config SCSI_BUSLOGIC
         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---
           This is support for BusLogic MultiMaster and FlashPoint SCSI Host
           Adapters. Consult the SCSI-HOWTO, available from
diff --git a/mm/Kconfig b/mm/Kconfig
index 8ac412b45f18..40559cfd49f7 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -168,3 +168,7 @@ config NR_QUICK
         depends on QUICKLIST
         default "2" if (SUPERH && !SUPERH64)
         default "1"
+
+config VIRT_TO_BUS
+        def_bool y
+        depends on !ARCH_NO_VIRT_TO_BUS
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 4b30ae6d8ba5..314477909f82 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -348,7 +348,7 @@ config MSND_FIFOSIZE
 
 config SOUND_VIA82CXXX
         tristate "VIA 82C686 Audio Codec"
-        depends on SOUND_PRIME && PCI && OSS_OBSOLETE
+        depends on SOUND_PRIME && PCI && OSS_OBSOLETE && VIRT_TO_BUS
         help
           Say Y here to include support for the audio codec found on VIA
           82Cxxx-based chips. Typically these are built into a motherboard.
@@ -368,7 +368,7 @@ config MIDI_VIA82CXXX
 
 config SOUND_OSS
         tristate "OSS sound modules"
-        depends on SOUND_PRIME && ISA_DMA_API
+        depends on SOUND_PRIME && ISA_DMA_API && VIRT_TO_BUS
         help
           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
@@ -417,6 +417,7 @@ config SOUND_CS4232
 config SOUND_SSCAPE
         tristate "Ensoniq SoundScape support"
         depends on SOUND_OSS
+        depends on VIRT_TO_BUS
         help
           Answer Y if you have a sound card based on the Ensoniq SoundScape
           chipset. Such cards are being manufactured at least by Ensoniq, Spea