diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-12 22:42:18 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-12-12 22:42:18 +0000 |
| commit | 811c287737892fe00307b9e7afb832fd459f6e6a (patch) | |
| tree | 361f1acf0bb77a59cdddefa0a8427afb494fe932 /target/linux/brcm47xx/patches-3.6/061-ssb-register-parallel-flash-device.patch | |
| parent | 9c0265ae1924e58fd92470bc395ea63f1e9c81cf (diff) | |
kernel: update bcma and ssb to master-2012-12-11-2 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34651 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 4 |
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 6e0d49184..b2f85ae65 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 @@ -50,7 +50,7 @@ } --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -543,6 +543,14 @@ static int ssb_devices_register(struct s +@@ -549,6 +549,14 @@ static int ssb_devices_register(struct s "Error registering serial flash\n"); } #endif @@ -67,7 +67,7 @@ error: --- a/drivers/ssb/ssb_private.h +++ b/drivers/ssb/ssb_private.h -@@ -223,4 +223,6 @@ static inline int ssb_sflash_init(struct +@@ -254,4 +254,6 @@ static inline int ssb_sflash_init(struct } #endif /* CONFIG_SSB_SFLASH */ |