summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.34/975-ssb_update.patch
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-13 17:13:11 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-03-13 17:13:11 +0000
commitdbf062aadfe81c54bfa147d21fe9ce83c5b7702b (patch)
treeb6a1b20795e47fc1d3a861fda103261a6fcb3f18 /target/linux/generic/patches-2.6.34/975-ssb_update.patch
parentd6c6d9b502bc41ac75557c417684243a202e8d0e (diff)
kernel: update to kernel version 2.6.34.8
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26125 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.34/975-ssb_update.patch')
-rw-r--r--target/linux/generic/patches-2.6.34/975-ssb_update.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-2.6.34/975-ssb_update.patch b/target/linux/generic/patches-2.6.34/975-ssb_update.patch
index e9b06d06b..33ea39ce5 100644
--- a/target/linux/generic/patches-2.6.34/975-ssb_update.patch
+++ b/target/linux/generic/patches-2.6.34/975-ssb_update.patch
@@ -299,7 +299,7 @@
tx_ring_dma + size > DMA_BIT_MASK(30)) {
kfree(tx_ring);
goto out_err;
-@@ -2178,12 +2169,14 @@ static int __devinit b44_init_one(struct
+@@ -2176,12 +2167,14 @@ static int __devinit b44_init_one(struct
"Failed to powerup the bus\n");
goto err_out_free_dev;
}
@@ -385,7 +385,7 @@
u32 pmucap;
if (!(cc->capabilities & SSB_CHIPCO_CAP_PMU))
-@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
+@@ -516,15 +516,12 @@ void ssb_pmu_init(struct ssb_chipcommon
ssb_dprintk(KERN_DEBUG PFX "Found rev %u PMU (capabilities 0x%08X)\n",
cc->pmu.rev, pmucap);