diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
| commit | e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61 (patch) | |
| tree | 4eef5783e11357f98df2083a49b4f240e8e3830c /target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch | |
| parent | 7c76e870395f36de61cadbd9ae4b0b7efc3dd4a7 (diff) | |
| download | upstream-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.gz upstream-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.tar.bz2 upstream-e5910acf7fe4b8f3dcb2e2ce60ee5f1de1eb7d61.zip | |
brcm63xx: 3.10: backport multi-board support
There have been no reported regressions, so backport it to 3.10.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41422 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch index 877b5177b8..a511af03af 100644 --- a/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch +++ b/target/linux/brcm63xx/patches-3.10/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch @@ -26,17 +26,17 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += boards/ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +--- a/arch/mips/bcm63xx/boards/board_common.c ++++ b/arch/mips/bcm63xx/boards/board_common.c @@ -34,6 +34,7 @@ #include <bcm63xx_dev_usb_usbd.h> #include <board_bcm963xx.h> #include <pci_ath9k_fixup.h> +#include <pci_rt2x00_fixup.h> - #include <uapi/linux/bcm933xx_hcs.h> - #include <uapi/linux/bcm963xx_tag.h> -@@ -1065,9 +1066,19 @@ int __init board_register_devices(void) + #include "board_common.h" + +@@ -293,9 +294,19 @@ int __init board_register_devices(void) } /* register any fixups */ @@ -61,7 +61,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices } --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c -@@ -193,7 +193,7 @@ void __init bcm63xx_flash_detect(void) +@@ -199,7 +199,7 @@ void __init bcm63xx_flash_detect(void) } } @@ -147,9 +147,9 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices + --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_flash.h -@@ -11,7 +11,7 @@ enum { +@@ -13,7 +13,7 @@ void bcm63xx_flash_detect(void); - void bcm63xx_flash_detect(void); + void bcm63xx_flash_force_phys_base_address(u32 start, u32 end); -int __init bcm63xx_flash_register(int num_caldata, struct ath9k_caldata *caldata); +int __init bcm63xx_flash_register(int num_caldata, struct bcm63xx_caldata *caldata); |