diff options
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
-rw-r--r-- | drivers/mtd/maps/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index c2624b2655ac..2a2a125b0c76 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
@@ -354,7 +354,7 @@ config MTD_WALNUT | |||
354 | 354 | ||
355 | config MTD_EBONY | 355 | config MTD_EBONY |
356 | tristate "Flash devices mapped on IBM 440GP Ebony" | 356 | tristate "Flash devices mapped on IBM 440GP Ebony" |
357 | depends on MTD_JEDECPROBE && EBONY | 357 | depends on MTD_JEDECPROBE && EBONY && !PPC_MERGE |
358 | help | 358 | help |
359 | This enables access routines for the flash chips on the IBM 440GP | 359 | This enables access routines for the flash chips on the IBM 440GP |
360 | Ebony board. If you have one of these boards and would like to | 360 | Ebony board. If you have one of these boards and would like to |