4 files changed, 6 insertions, 4 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index d618e867399..e960a9300eb 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -83,7 +83,7 @@ config MMC_RICOH_MMC
 
 config MMC_SDHCI_OF
         tristate "SDHCI support on OpenFirmware platforms"
-        depends on MMC_SDHCI && PPC_OF
+        depends on MMC_SDHCI && OF
         help
           This selects the OF support for Secure Digital Host Controller
           Interfaces.
@@ -93,6 +93,7 @@ config MMC_SDHCI_OF
 config MMC_SDHCI_OF_ESDHC
         bool "SDHCI OF support for the Freescale eSDHC controller"
         depends on MMC_SDHCI_OF
+        depends on PPC_OF
         select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
         help
           This selects the Freescale eSDHC controller support.
@@ -102,6 +103,7 @@ config MMC_SDHCI_OF_ESDHC
 config MMC_SDHCI_OF_HLWD
         bool "SDHCI OF support for the Nintendo Wii SDHCI controllers"
         depends on MMC_SDHCI_OF
+        depends on PPC_OF
         select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
         help
           This selects the Secure Digital Host Controller Interface (SDHCI)
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 1e2cbf5d9aa..b1f76891739 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -159,7 +159,7 @@ config MTD_AFS_PARTS
 
 config MTD_OF_PARTS
         tristate "Flash partition map based on OF description"
-        depends on (MICROBLAZE || PPC_OF) && MTD_PARTITIONS
+        depends on OF && MTD_PARTITIONS
         help
           This provides a partition parsing function which derives
           the partition map from the children of the flash node,
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index a0dd7bba948..5d37d315fa9 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -72,7 +72,7 @@ config MTD_PHYSMAP_BANKWIDTH
 
 config MTD_PHYSMAP_OF
         tristate "Flash device in physical memory map based on OF description"
-        depends on (MICROBLAZE || PPC_OF) && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
+        depends on OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
         help
           This provides a 'mapping' driver which allows the NOR Flash and
           ROM driver code to communicate with chips which are mapped
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index aff9dcd051c..9d109f9a5c7 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1402,7 +1402,7 @@ config SERIAL_NETX_CONSOLE
 
 config SERIAL_OF_PLATFORM
         tristate "Serial port on Open Firmware platform bus"
-        depends on PPC_OF || MICROBLAZE
+        depends on OF
         depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL
         help
           If you have a PowerPC based system that has serial ports