brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.

SVN-Revision: 32845

1 files changed, 0 insertions, 41 deletions

diff --git a/target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch b/target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch
deleted file mode 100644
index 31ed817cca..0000000000
--- a/target/linux/brcm47xx/patches-3.3/252-bcma-add-boardinfo-struct.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -297,6 +297,8 @@ static void __init bcm47xx_register_bcma
- 	
- 	if (bcm47xx_bus.bcma.bus.drv_cc.flash_type == BCMA_NFLASH)
- 		bcm47xx_nflash_struct_bcma_init(&bcm47xx_nflash, &bcm47xx_bus.bcma.bus.drv_cc);
-+
-+	bcm47xx_fill_bcma_boardinfo(&bcm47xx_bus.bcma.bus.boardinfo, NULL);
- }
- 
- static int __init bcm47xx_register_flash_bcma(void)
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -628,3 +628,15 @@ void bcm47xx_fill_ssb_boardinfo(struct s
- 	nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0);
- }
- #endif
-+
-+#ifdef CONFIG_BCM47XX_BCMA
-+void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
-+				 const char *prefix)
-+{
-+	nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0);
-+	if (!boardinfo->vendor)
-+		boardinfo->vendor = SSB_BOARDVENDOR_BCM;
-+
-+	nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0);
-+}
-+#endif
---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-@@ -51,5 +51,9 @@ void bcm47xx_fill_sprom_ethernet(struct
- void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
- 				const char *prefix);
- #endif
-+#ifdef CONFIG_BCM47XX_BCMA
-+void bcm47xx_fill_bcma_boardinfo(struct bcma_boardinfo *boardinfo,
-+				 const char *prefix);
-+#endif
- 
- #endif /* __ASM_BCM47XX_H */