diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 06:23:57 -0400 |
| commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
| tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /drivers/mtd/devices | |
| parent | 8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff) | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
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 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c index d574916e7821..d8cc94ec4e50 100644 --- a/drivers/mtd/devices/docprobe.c +++ b/drivers/mtd/devices/docprobe.c | |||
| @@ -81,10 +81,7 @@ static unsigned long __initdata doc_locations[] = { | |||
| 81 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ | 81 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ |
| 82 | #elif defined(__PPC__) | 82 | #elif defined(__PPC__) |
| 83 | 0xe4000000, | 83 | 0xe4000000, |
| 84 | #elif defined(CONFIG_MOMENCO_OCELOT) | 84 | #else |
| 85 | 0x2f000000, | ||
| 86 | 0xff000000, | ||
| 87 | ##else | ||
| 88 | #warning Unknown architecture for DiskOnChip. No default probe locations defined | 85 | #warning Unknown architecture for DiskOnChip. No default probe locations defined |
| 89 | #endif | 86 | #endif |
| 90 | 0xffffffff }; | 87 | 0xffffffff }; |