diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2011-12-19 23:33:03 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-12-19 23:33:03 +0000 |
commit | a8b46480d3b892dfc0ea90b70c98f2231a83a25b (patch) | |
tree | 2c691892f4e36354a69a84b539a774c4c546947f /target/linux/brcm47xx/patches-3.0/951-brcm4716-defines.patch | |
parent | a4209940dba330a4084295315c8abcf879a902e3 (diff) | |
download | upstream-a8b46480d3b892dfc0ea90b70c98f2231a83a25b.tar.gz upstream-a8b46480d3b892dfc0ea90b70c98f2231a83a25b.tar.bz2 upstream-a8b46480d3b892dfc0ea90b70c98f2231a83a25b.zip |
kernel: update bcma and ssb to version master-2011-12-16 from wireless-testing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29574 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 |