1 --- a/drivers/mtd/bcm63xxpart.c
2 +++ b/drivers/mtd/bcm63xxpart.c
4 #include <linux/mtd/mtd.h>
5 #include <linux/mtd/partitions.h>
8 +#include <asm/mach-bcm63xx/bcm63xx_board.h>
10 #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */
13 #define STR_NULL_TERMINATE(x) \
14 do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0)
16 -static int bcm63xx_detect_cfe(struct mtd_info *master)
22 - ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,
29 - if (strncmp("cfe-v", buf, 5) == 0)
32 - /* very old CFE's do not have the cfe-v string, so check for magic */
33 - ret = mtd_read(master, BCM963XX_CFE_MAGIC_OFFSET, 8, &retlen,
37 - return strncmp("CFE1CFE1", buf, 8);
40 static int bcm63xx_read_nvram(struct mtd_info *master,
41 struct bcm963xx_nvram *nvram)
43 @@ -152,7 +130,7 @@ static int bcm63xx_parse_cfe_partitions(
44 struct bcm963xx_nvram *nvram = NULL;
47 - if (bcm63xx_detect_cfe(master))
48 + if (!bcm63xx_is_cfe_present())
51 nvram = vzalloc(sizeof(*nvram));