#include <uapi/linux/bcm933xx_hcs.h>
#include <uapi/linux/bcm963xx_tag.h>
-@@ -1047,9 +1048,19 @@ int __init board_register_devices(void)
+@@ -1056,9 +1057,19 @@ int __init board_register_devices(void)
}
/* register any fixups */
}
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -163,7 +163,7 @@ static int __init bcm63xx_detect_flash_t
- return 0;
+@@ -193,7 +193,7 @@ void __init bcm63xx_flash_detect(void)
+ }
}
-int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata)
+
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h
-@@ -11,6 +11,6 @@ enum {
+@@ -11,7 +11,7 @@ enum {
- extern int bcm63xx_attached_flash;
+ void bcm63xx_flash_detect(void);
-int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata);
+int __init bcm63xx_flash_register(int num_caldata, struct bcm63xx_caldata *caldata);
- #endif /* __BCM63XX_FLASH_H */
+ int bcm63xx_flash_get_type(void);
+
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -9,6 +9,7 @@