X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=drivers%2Fmtd%2Fmaps%2FKconfig;h=2a2a125b0c760a795be1f77bb8889aa21c381a15;hp=c2624b2655ac49e912a8bf1e3de6147672b9c920;hb=ebf8889bd1fe3615991ff4494635d237280652a2;hpb=b160292cc216a50fd0cd386b0bda2cd48352c73b

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