From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 1 Aug 2007 10:23:57 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.24-rc1~1364^2~38
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=440fdb53b4ae58602711b5b8c3a139ace2404dbb;p=linux.git

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

440fdb53b4ae58602711b5b8c3a139ace2404dbb
diff --cc drivers/mtd/devices/docprobe.c
index d574916e7821,54aa75907640..d8cc94ec4e50
--- a/drivers/mtd/devices/docprobe.c
+++ b/drivers/mtd/devices/docprobe.c
@@@ -81,10 -81,9 +81,7 @@@ static unsigned long __initdata doc_loc
  #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
  #elif defined(__PPC__)
  	0xe4000000,
- #elif defined(CONFIG_MOMENCO_OCELOT)
- 	0x2f000000,
 -#elif defined(CONFIG_MOMENCO_OCELOT_G)
--        0xff000000,
--##else
++#else
  #warning Unknown architecture for DiskOnChip. No default probe locations defined
  #endif
  	0xffffffff };
diff --cc drivers/mtd/nand/diskonchip.c
index 5f3049a424c4,e96259f22cca..ab9f5c5db38d
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@@ -56,9 -56,8 +56,6 @@@ static unsigned long __initdata doc_loc
  #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
  #elif defined(__PPC__)
  	0xe4000000,
- #elif defined(CONFIG_MOMENCO_OCELOT)
- 	0x2f000000,
 -#elif defined(CONFIG_MOMENCO_OCELOT_G)
--	0xff000000,
  #else
  #warning Unknown architecture for DiskOnChip. No default probe locations defined
  #endif