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

diff --cc drivers/mtd/devices/docprobe.c
index d574916e7821ce1d740178e9023358e25ff81953,54aa7590764028c673a6b8e9dec1a06a5dbfbf8f..d8cc94ec4e504495421c5a3a558c02cdf8fff024
--- 1/drivers/mtd/devices/docprobe.c
--- 2/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 5f3049a424c47ea98a0dd44d83c9c68d77a83f46,e96259f22cca3405b6919c2d01f3b5eb11049552..ab9f5c5db38d35287c249a93b61c23246d249717
--- 1/drivers/mtd/nand/diskonchip.c
--- 2/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