aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-10 14:05:18 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-01-10 14:05:18 +0000
commit885eea184225e2d190f7aa8742ac806034caa9fc (patch)
treed60d951609d8e3a315c92b06a0670dc814525594 /target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch
parenta2950fabd4c84c867bf303e2e92bf99c2eb8b87a (diff)
downloadupstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.gz
upstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.bz2
upstream-885eea184225e2d190f7aa8742ac806034caa9fc.zip
kernel: update bcma and ssb to master-2013-01-09 from wireless-testing
SVN-Revision: 35080
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch b/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch
index b2f85ae656..3c90013d6c 100644
--- a/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch
+++ b/target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch
@@ -67,9 +67,9 @@
error:
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
-@@ -254,4 +254,6 @@ static inline int ssb_sflash_init(struct
+@@ -271,4 +271,6 @@ static inline int ssb_gpio_init(struct s
}
- #endif /* CONFIG_SSB_SFLASH */
+ #endif /* CONFIG_SSB_DRIVER_GPIO */
+extern struct platform_device ssb_pflash_dev;
+