diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-05 13:29:54 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-05 13:29:54 +0000 |
| commit | 18982296c750b8bd433669adb28134d645e68932 (patch) | |
| tree | 35d0d5198e8b74db4acc09b4a81843b4047f7b24 /target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch | |
| parent | 1b523918ffb6dc3913599426e17882db0a5b4d83 (diff) | |
Merge branch 'bcm63xx'
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30819 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch b/target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch index 1181d102b..7f95d3fed 100644 --- a/target/linux/brcm63xx/patches-3.3/977-ssb_export_fallback_sprom.patch +++ b/target/linux/brcm63xx/patches-3.3/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, }; |