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

1 files changed, 0 insertions, 43 deletions

diff --git a/arch/powerpc/boot/cuboot-warp.c b/arch/powerpc/boot/cuboot-warp.c
index 21780210057d..806df693fea6 100644
--- a/arch/powerpc/boot/cuboot-warp.c
+++ b/arch/powerpc/boot/cuboot-warp.c
@@ -18,57 +18,14 @@
 
 static bd_t bd;
 
-static void warp_fixup_one_nor(u32 from, u32 to)
-{
-        void *devp;
-        char name[50];
-        u32 v[2];
-
-        sprintf(name, "/plb/opb/ebc/nor_flash@0,0/partition@%x", from);
-
-        devp = finddevice(name);
-        if (!devp)
-                return;
-
-        if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
-                v[0] = to;
-                setprop(devp, "reg", v, sizeof(v));
-
-                printf("NOR 64M fixup %x -> %x\r\n", from, to);
-        }
-}
-
-
 static void warp_fixups(void)
 {
         ibm440ep_fixup_clocks(66000000, 11059200, 50000000);
         ibm4xx_sdram_fixup_memsize();
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
         dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
-
-        /* Fixup for 64M flash on Rev A boards. */
-        if (bd.bi_flashsize == 0x4000000) {
-                void *devp;
-                u32 v[3];
-
-                devp = finddevice("/plb/opb/ebc/nor_flash@0,0");
-                if (!devp)
-                        return;
-
-                /* Fixup the size */
-                if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
-                        v[2] = bd.bi_flashsize;
-                        setprop(devp, "reg", v, sizeof(v));
-                }
-
-                /* Fixup parition offsets */
-                warp_fixup_one_nor(0x300000, 0x3f00000);
-                warp_fixup_one_nor(0x340000, 0x3f40000);
-                warp_fixup_one_nor(0x380000, 0x3f80000);
-        }
 }
 
-
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {