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
 
 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