diff options
Diffstat (limited to 'drivers/mtd/maps/Kconfig')
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index cc6c73442435..3a6566adcdda 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -354,7 +354,7 @@ config MTD_CFI_FLAGADM | |||
| 354 | 354 | ||
| 355 | config MTD_WALNUT | 355 | config MTD_WALNUT |
| 356 | tristate "Flash device mapped on IBM 405GP Walnut" | 356 | tristate "Flash device mapped on IBM 405GP Walnut" |
| 357 | depends on MTD_JEDECPROBE && WALNUT | 357 | depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE |
| 358 | help | 358 | help |
| 359 | This enables access routines for the flash chips on the IBM 405GP | 359 | This enables access routines for the flash chips on the IBM 405GP |
| 360 | Walnut board. If you have one of these boards and would like to | 360 | Walnut board. If you have one of these boards and would like to |
| @@ -370,7 +370,7 @@ config MTD_EBONY | |||
| 370 | 370 | ||
| 371 | config MTD_OCOTEA | 371 | config MTD_OCOTEA |
| 372 | tristate "Flash devices mapped on IBM 440GX Ocotea" | 372 | tristate "Flash devices mapped on IBM 440GX Ocotea" |
| 373 | depends on MTD_CFI && OCOTEA | 373 | depends on MTD_CFI && OCOTEA && !PPC_MERGE |
| 374 | help | 374 | help |
| 375 | This enables access routines for the flash chips on the IBM 440GX | 375 | This enables access routines for the flash chips on the IBM 440GX |
| 376 | Ocotea board. If you have one of these boards and would like to | 376 | Ocotea board. If you have one of these boards and would like to |