[kernel] generic-2.6/2.6.24: refresh patches

[openwrt.git] / target / linux / brcm-2.4 / files / drivers / mtd / maps / bcm947xx-flash.c

diff --git a/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c b/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c
index 3176eb0..eea7f13 100644 (file)
--- a/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c
+++ b/target/linux/brcm-2.4/files/drivers/mtd/maps/bcm947xx-flash.c
@@ -56,7 +56,6 @@
 #include <typedefs.h>
 #include <osl.h>
 #include <bcmnvram.h>
 #include <typedefs.h>
 #include <osl.h>
 #include <bcmnvram.h>

-#include <bcmutils.h>

 #include <sbconfig.h>
 #include <sbchipc.h>
 #include <sbutils.h>
 #include <sbconfig.h>
 #include <sbchipc.h>
 #include <sbutils.h>


@@ -158,7 +157,7 @@ static struct mtd_partition bcm947xx_parts[] = {
        { name: "linux", offset: 0, size: 0, },
        { name: "rootfs", offset: 0, size: 0, },
        { name: "nvram", offset: 0, size: 0, },
        { name: "linux", offset: 0, size: 0, },
        { name: "rootfs", offset: 0, size: 0, },
        { name: "nvram", offset: 0, size: 0, },

-       { name: "OpenWrt", offset: 0, size: 0, },
+       { name: "rootfs_data", offset: 0, size: 0, },

        { name: NULL, },
 };
 
        { name: NULL, },
 };
 


@@ -470,7 +469,7 @@ mod_init_t init_bcm947xx_map(void)
 
        /* Check strapping option if chipcommon exists */
        if ((cc = sb_setcore(sbh, SB_CC, 0))) {
 
        /* Check strapping option if chipcommon exists */
        if ((cc = sb_setcore(sbh, SB_CC, 0))) {

-               fltype = readl(&cc->capabilities) & CAP_FLASH_MASK;
+               fltype = readl(&cc->capabilities) & CC_CAP_FLASH_MASK;

                if (fltype == PFLASH) {
                        bcm947xx_map.map_priv_2 = 1;
                        window_addr = 0x1c000000;
                if (fltype == PFLASH) {
                        bcm947xx_map.map_priv_2 = 1;
                        window_addr = 0x1c000000;