X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Ffiles%2Fdrivers%2Fmtd%2Fmaps%2Fbcm963xx-flash.c;h=504dfac8495cb45709f1db78a302a01bc1b02ccd;hb=95c0a2e2269d18875aa1f1805fb1229f901aa790;hp=7d01a9e8f00abf44cc5fff69d17ec2bf2a44b703;hpb=33ffd60e664552e17b6f883303f8b3dff8abe8f9;p=openwrt-10.03%2F.git

diff --git a/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c b/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
index 7d01a9e8f..504dfac84 100644
--- a/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
+++ b/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
@@ -128,10 +128,6 @@ int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts
                nrparts++;
                namelen =+ 6;
        };
-       if (sparelen > 0){
-               nrparts++;
-               namelen =+ 6;
-       };
        // Ask kernel for more memory.
        parts = kmalloc(sizeof(*parts)*nrparts+10*nrparts, GFP_KERNEL);
        if (!parts){
@@ -145,24 +141,20 @@ int parse_cfe_partitions( struct mtd_info *master, struct mtd_partition **pparts
        parts[curpart].size = master->erasesize;
        curpart++;
        if (kernellen > 0){
-               parts[curpart].name = "Kernel";
+               parts[curpart].name = "kernel";
                parts[curpart].offset = kerneladdr;
                parts[curpart].size = kernellen;
                curpart++;
        };
        if (rootfslen > 0){
-               parts[curpart].name = "Rootfs";
+               parts[curpart].name = "rootfs";
                parts[curpart].offset = rootfsaddr;
                parts[curpart].size = rootfslen;
+               if (sparelen > 0)
+                       parts[curpart].size += sparelen;
                curpart++;
        };
-       if (sparelen > 0){
-               parts[curpart].name = "OpenWrt";
-               parts[curpart].offset = spareaddr;
-               parts[curpart].size = sparelen;
-               curpart++;
-       };
-       parts[curpart].name = "NVRAM";
+       parts[curpart].name = "nvram";
        parts[curpart].offset = master->size - master->erasesize;
        parts[curpart].size = master->erasesize;
        for (i = 0; i < nrparts; i++) {