diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/mtd/nand | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/diskonchip.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |