diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:04:25 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-07-22 16:04:25 +0000 |
| commit | c818073c4a312dc687e49a4981e013bff40b38d3 (patch) | |
| tree | 0a98f37422ee96220e985cc94a509bf6df8ff3fe /target/linux/generic/patches-3.0/020-ssb_update.patch | |
| parent | eac5958fa7554062a044be973607e21c27166416 (diff) | |
| download | upstream-c818073c4a312dc687e49a4981e013bff40b38d3.tar.gz upstream-c818073c4a312dc687e49a4981e013bff40b38d3.tar.bz2 upstream-c818073c4a312dc687e49a4981e013bff40b38d3.zip | |
kernel: update to linux-3.0 and refresh patches.
Thank you Peter Wagner for the patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27722 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/020-ssb_update.patch')
| -rw-r--r-- | target/linux/generic/patches-3.0/020-ssb_update.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.0/020-ssb_update.patch b/target/linux/generic/patches-3.0/020-ssb_update.patch index a310d90f92..817c4f4ddd 100644 --- a/target/linux/generic/patches-3.0/020-ssb_update.patch +++ b/target/linux/generic/patches-3.0/020-ssb_update.patch @@ -77,15 +77,17 @@ { u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0)); if (((tmp & 0xF000) >> 12) != pc->dev->core_index) { -@@ -514,13 +514,13 @@ static void ssb_pcicore_pcie_setup_worka +@@ -514,7 +514,7 @@ static void ssb_pcicore_pcie_setup_worka * Generic and Clientmode operation code. **************************************************/ -static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) +static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) { - /* Disable PCI interrupts. */ - ssb_write32(pc->dev, SSB_INTVEC, 0); + ssb_pcicore_fix_sprom_core_index(pc); + +@@ -529,7 +529,7 @@ static void ssb_pcicore_init_clientmode( + } } -void ssb_pcicore_init(struct ssb_pcicore *pc) |