1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index cc6c73442435..5850ccd0dc07 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -354,7 +354,7 @@ config MTD_CFI_FLAGADM
 
 config MTD_WALNUT
         tristate "Flash device mapped on IBM 405GP Walnut"
-        depends on MTD_JEDECPROBE && WALNUT
+        depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
         help
           This enables access routines for the flash chips on the IBM 405GP
           Walnut board. If you have one of these boards and would like to
@@ -370,7 +370,7 @@ config MTD_EBONY
 
 config MTD_OCOTEA
         tristate "Flash devices mapped on IBM 440GX Ocotea"
-        depends on MTD_CFI && OCOTEA
+        depends on MTD_CFI && OCOTEA && !PPC_MERGE
         help
           This enables access routines for the flash chips on the IBM 440GX
           Ocotea board. If you have one of these boards and would like to
@@ -384,14 +384,6 @@ config MTD_REDWOOD
           Redwood board. If you have one of these boards and would like to
           use the flash chips on it, say 'Y'.
 
-config MTD_TQM834x
-        tristate "Flash device mapped on TQ Components TQM834x Boards"
-        depends on MTD_CFI && TQM834x
-        help
-          This enables access routines for the flash chips on the
-          TQ Components TQM834x boards. If you have one of these boards
-          and would like to use the flash chips on it, say 'Y'.
-
 config MTD_OCELOT
         tristate "Momenco Ocelot boot flash device"
         depends on MOMENCO_OCELOT