diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-12-19 23:33:03 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-12-19 23:33:03 +0000 |
commit | 1aa5a61754d4995d8144a48dde0565211da0d5a8 (patch) | |
tree | a2c895a01cfc9fed7c1ae00faa35a208503c6de7 /target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch | |
parent | 91d0ef6f19337ec72482a0eedf4e4ae91ffffca1 (diff) | |
download | upstream-1aa5a61754d4995d8144a48dde0565211da0d5a8.tar.gz upstream-1aa5a61754d4995d8144a48dde0565211da0d5a8.tar.bz2 upstream-1aa5a61754d4995d8144a48dde0565211da0d5a8.zip |
kernel: update bcma and ssb to version master-2011-12-16 from wireless-testing
SVN-Revision: 29574
Diffstat (limited to 'target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch b/target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch index 25cd469964..18685af6eb 100644 --- a/target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch +++ b/target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch @@ -25,7 +25,7 @@ ssb_printk(KERN_ERR PFX --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h -@@ -157,9 +157,16 @@ struct ssb_bus_ops { +@@ -166,9 +166,16 @@ struct ssb_bus_ops { #define SSB_DEV_MINI_MACPHY 0x823 #define SSB_DEV_ARM_1176 0x824 #define SSB_DEV_ARM_7TDMI 0x825 @@ -60,7 +60,7 @@ /* Enumeration space constants */ #define SSB_CORE_SIZE 0x1000 /* Size of a core MMIO area */ -@@ -499,5 +501,41 @@ enum { +@@ -556,5 +558,41 @@ enum { #define SSB_ADM_BASE2 0xFFFF0000 /* Type2 base address for the core */ #define SSB_ADM_BASE2_SHIFT 16 |