diff options
author | Florian Fainelli <florian@openwrt.org> | 2012-03-05 13:29:54 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2012-03-05 13:29:54 +0000 |
commit | 631a035a76580af3755e0151cc94d6685ab89949 (patch) | |
tree | 547329f159981754f7dce31d7bc24c2369cdcb65 /target/linux/brcm63xx/patches-3.2/977-ssb_export_fallback_sprom.patch | |
parent | 74946bb022331ea8717e33f6abe049968a20cb3c (diff) | |
download | upstream-631a035a76580af3755e0151cc94d6685ab89949.tar.gz upstream-631a035a76580af3755e0151cc94d6685ab89949.tar.bz2 upstream-631a035a76580af3755e0151cc94d6685ab89949.zip |
Merge branch 'bcm63xx'
SVN-Revision: 30819
Diffstat (limited to 'target/linux/brcm63xx/patches-3.2/977-ssb_export_fallback_sprom.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.2/977-ssb_export_fallback_sprom.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.2/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.2/977-ssb_export_fallback_sprom.patch index 1181d102b9..7f95d3fed9 100644 --- a/target/linux/brcm63xx/patches-3.2/977-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-3.2/977-ssb_export_fallback_sprom.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2109,7 +2109,7 @@ static void __init nb4_nvram_fixup(void) +@@ -2211,7 +2211,7 @@ static void __init nb4_nvram_fixup(void) * bcm4318 WLAN work */ #ifdef CONFIG_SSB_PCIHOST @@ -9,7 +9,7 @@ .revision = 0x02, .board_rev = 0x17, .country_code = 0x0, -@@ -2129,6 +2129,7 @@ static struct ssb_sprom bcm63xx_sprom = +@@ -2231,6 +2231,7 @@ static struct ssb_sprom bcm63xx_sprom = .boardflags_lo = 0x2848, .boardflags_hi = 0x0000, }; |