diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-03-13 17:13:11 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-03-13 17:13:11 +0000 |
| commit | cb96d8a00d470b67b83020b069ef45eb27f36709 (patch) | |
| tree | b6a1b20795e47fc1d3a861fda103261a6fcb3f18 /target/linux/generic/patches-2.6.34/975-ssb_update.patch | |
| parent | 1968a3c5fd3a54aa60e98752b1439199b12fba3d (diff) | |
| download | upstream-cb96d8a00d470b67b83020b069ef45eb27f36709.tar.gz upstream-cb96d8a00d470b67b83020b069ef45eb27f36709.tar.bz2 upstream-cb96d8a00d470b67b83020b069ef45eb27f36709.zip | |
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.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); |