aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.37/951-brcm4716-defines.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2011-03-13 17:24:28 +0000
committerHauke Mehrtens <hauke@openwrt.org>2011-03-13 17:24:28 +0000
commitb2b9c9a950d03afcf66a80dfb4592365bf1bd794 (patch)
tree982e38238f465d6b03e83287949cbdbce14997e7 /target/linux/brcm47xx/patches-2.6.37/951-brcm4716-defines.patch
parent910545f3ebfd8e104082b7093613fdada2d0d07e (diff)
downloadmaster-187ad058-b2b9c9a950d03afcf66a80dfb4592365bf1bd794.tar.gz
master-187ad058-b2b9c9a950d03afcf66a80dfb4592365bf1bd794.tar.bz2
master-187ad058-b2b9c9a950d03afcf66a80dfb4592365bf1bd794.zip
ssb: update ssb to version from linux-next-20110311
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26127 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.37/951-brcm4716-defines.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/951-brcm4716-defines.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/951-brcm4716-defines.patch b/target/linux/brcm47xx/patches-2.6.37/951-brcm4716-defines.patch
index 442afc5dc0..4cd7008915 100644
--- a/target/linux/brcm47xx/patches-2.6.37/951-brcm4716-defines.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/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
-@@ -151,9 +151,16 @@ struct ssb_bus_ops {
+@@ -155,9 +155,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 */
-@@ -454,5 +456,41 @@ enum {
+@@ -499,5 +501,41 @@ enum {
#define SSB_ADM_BASE2 0xFFFF0000 /* Type2 base address for the core */
#define SSB_ADM_BASE2_SHIFT 16