diff options
| author | David Woodhouse | 2007-07-11 15:55:48 +0200 |
|---|---|---|
| committer | David Woodhouse | 2007-07-11 15:55:48 +0200 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/mtd/devices | |
| parent | [JFFS2] Add support for write-buffer verification. (diff) | |
| parent | lots-of-architectures: enable arbitary speed tty support (diff) | |
| download | kernel-qcow2-linux-db1b39d8b860e3716620c225bc86e0ec41764e34.tar.gz kernel-qcow2-linux-db1b39d8b860e3716620c225bc86e0ec41764e34.tar.xz kernel-qcow2-linux-db1b39d8b860e3716620c225bc86e0ec41764e34.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/devices')
| -rw-r--r-- | drivers/mtd/devices/docprobe.c | 2 |
1 files changed, 1 insertions, 1 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[] = { #elif defined(CONFIG_MOMENCO_OCELOT) 0x2f000000, 0xff000000, -#elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C) +#elif defined(CONFIG_MOMENCO_OCELOT_G) 0xff000000, ##else #warning Unknown architecture for DiskOnChip. No default probe locations defined |