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/nand | |
| 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/nand')
| -rw-r--r-- | drivers/mtd/nand/diskonchip.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index 5f3049a424c4..ab9f5c5db38d 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c | |||
| @@ -56,9 +56,6 @@ static unsigned long __initdata doc_locations[] = { | |||
| 56 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ | 56 | #endif /* CONFIG_MTD_DOCPROBE_HIGH */ |
| 57 | #elif defined(__PPC__) | 57 | #elif defined(__PPC__) |
| 58 | 0xe4000000, | 58 | 0xe4000000, |
| 59 | #elif defined(CONFIG_MOMENCO_OCELOT) | ||
| 60 | 0x2f000000, | ||
| 61 | 0xff000000, | ||
| 62 | #else | 59 | #else |
| 63 | #warning Unknown architecture for DiskOnChip. No default probe locations defined | 60 | #warning Unknown architecture for DiskOnChip. No default probe locations defined |
| 64 | #endif | 61 | #endif |