diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/devices/docprobe.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/diskonchip.c | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c index 78872c3f3760..b96ac8e119dc 100644 --- a/drivers/mtd/devices/docprobe.c +++ b/drivers/mtd/devices/docprobe.c | |||
| @@ -84,7 +84,7 @@ static unsigned long __initdata doc_locations[] = { | |||
| 84 | #elif defined(CONFIG_MOMENCO_OCELOT) | 84 | #elif defined(CONFIG_MOMENCO_OCELOT) |
| 85 | 0x2f000000, | 85 | 0x2f000000, |
| 86 | 0xff000000, | 86 | 0xff000000, |
| 87 | #elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C) | 87 | #elif defined(CONFIG_MOMENCO_OCELOT_G) |
| 88 | 0xff000000, | 88 | 0xff000000, |
| 89 | ##else | 89 | ##else |
| 90 | #warning Unknown architecture for DiskOnChip. No default probe locations defined | 90 | #warning Unknown architecture for DiskOnChip. No default probe locations defined |
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index 595208f965a5..17c868034aad 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c | |||
| @@ -59,7 +59,7 @@ static unsigned long __initdata doc_locations[] = { | |||
| 59 | #elif defined(CONFIG_MOMENCO_OCELOT) | 59 | #elif defined(CONFIG_MOMENCO_OCELOT) |
| 60 | 0x2f000000, | 60 | 0x2f000000, |
| 61 | 0xff000000, | 61 | 0xff000000, |
| 62 | #elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C) | 62 | #elif defined(CONFIG_MOMENCO_OCELOT_G) |
| 63 | 0xff000000, | 63 | 0xff000000, |
| 64 | #else | 64 | #else |
| 65 | #warning Unknown architecture for DiskOnChip. No default probe locations defined | 65 | #warning Unknown architecture for DiskOnChip. No default probe locations defined |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 5cc3d517e39b..62a1390458c3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2307,7 +2307,7 @@ config UGETH_TX_ON_DEMAND | |||
| 2307 | 2307 | ||
| 2308 | config MV643XX_ETH | 2308 | config MV643XX_ETH |
| 2309 | tristate "MV-643XX Ethernet support" | 2309 | tristate "MV-643XX Ethernet support" |
| 2310 | depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) | 2310 | depends on MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) |
| 2311 | select MII | 2311 | select MII |
| 2312 | help | 2312 | help |
| 2313 | This driver supports the gigabit Ethernet on the Marvell MV643XX | 2313 | This driver supports the gigabit Ethernet on the Marvell MV643XX |