diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-03-13 17:13:11 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-03-13 17:13:11 +0000 |
| commit | 425bf41b231233c8b4e8cf7b7ad90bba1f6b2653 (patch) | |
| tree | b89bc86eb1f6be17960d7ca4c1fe57f1c7afb13c /target/linux/generic/patches-2.6.34/975-ssb_update.patch | |
| parent | b78210955c6b2c6f54b0d71fea2c6d0ed7f00e76 (diff) | |
| download | upstream-425bf41b231233c8b4e8cf7b7ad90bba1f6b2653.tar.gz upstream-425bf41b231233c8b4e8cf7b7ad90bba1f6b2653.tar.bz2 upstream-425bf41b231233c8b4e8cf7b7ad90bba1f6b2653.zip | |
kernel: update to kernel version 2.6.34.8
SVN-Revision: 26125
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.patch | 4 |
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 e9b06d06bf..33ea39ce52 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); |