git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
diskonchip.c
diff --git
a/drivers/mtd/nand/diskonchip.c
b/drivers/mtd/nand/diskonchip.c
index
e96259f
..
ab9f5c5
100644
(file)
--- a/
drivers/mtd/nand/diskonchip.c
+++ b/
drivers/mtd/nand/diskonchip.c
@@
-56,8
+56,6
@@
static unsigned long __initdata doc_locations[] = {
#endif /* CONFIG_MTD_DOCPROBE_HIGH */
#elif defined(__PPC__)
0xe4000000,
-#elif defined(CONFIG_MOMENCO_OCELOT_G)
- 0xff000000,
#else
#warning Unknown architecture for DiskOnChip. No default probe locations defined
#endif