diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /drivers/mtd/maps/Kconfig | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 |