Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / drivers / mtd / maps / Kconfig

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index c2624b2655ac49e912a8bf1e3de6147672b9c920..2a2a125b0c760a795be1f77bb8889aa21c381a15 100644 (file)
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -354,7 +354,7 @@ config MTD_WALNUT
 
 config MTD_EBONY
        tristate "Flash devices mapped on IBM 440GP Ebony"
 
 config MTD_EBONY
        tristate "Flash devices mapped on IBM 440GP Ebony"

-       depends on MTD_JEDECPROBE && EBONY
+       depends on MTD_JEDECPROBE && EBONY && !PPC_MERGE

        help
          This enables access routines for the flash chips on the IBM 440GP
          Ebony board. If you have one of these boards and would like to
        help
          This enables access routines for the flash chips on the IBM 440GP
          Ebony board. If you have one of these boards and would like to