lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source
This commit is contained in:
David Woodhouse
2007-08-01 11:23:57 +01:00
parent 8b2b403ce0 8d4fbcfbe0
commit 440fdb53b4
1557 changed files with 36899 additions and 74677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mtd/nand/diskonchip.c
View File

@@ -56,9 +56,6 @@ static unsigned long __initdata doc_locations[] = {
#endif /* CONFIG_MTD_DOCPROBE_HIGH */
#elif defined(__PPC__)
0xe4000000,
#elif defined(CONFIG_MOMENCO_OCELOT)
0x2f000000,
0xff000000,
#else
#warning Unknown architecture for DiskOnChip. No default probe locations defined
#endif