diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-13 14:38:28 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-01-13 14:38:28 +0000 |
| commit | f1f885a356aaf04e494adbaa3b5457e434f58640 (patch) | |
| tree | e5cb11e1cd143af6f6e6d04cbfe2ee8699505789 /target/linux/generic/patches-3.1/020-ssb_update.patch | |
| parent | 6b4b162100ec5ae169583100efa53c6a41cbca7d (diff) | |
kernel: update linux 3.1 to 3.1.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29726 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.1/020-ssb_update.patch')
| -rw-r--r-- | target/linux/generic/patches-3.1/020-ssb_update.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/target/linux/generic/patches-3.1/020-ssb_update.patch b/target/linux/generic/patches-3.1/020-ssb_update.patch index 9dc63adfa..c67097b3e 100644 --- a/target/linux/generic/patches-3.1/020-ssb_update.patch +++ b/target/linux/generic/patches-3.1/020-ssb_update.patch @@ -8,25 +8,6 @@ #include <linux/ssb/ssb.h> #include "ssb_private.h" ---- a/drivers/ssb/driver_pcicore.c -+++ b/drivers/ssb/driver_pcicore.c -@@ -516,10 +516,14 @@ static void ssb_pcicore_pcie_setup_worka - - static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) - { -- ssb_pcicore_fix_sprom_core_index(pc); -+ struct ssb_device *pdev = pc->dev; -+ struct ssb_bus *bus = pdev->bus; -+ -+ if (bus->bustype == SSB_BUSTYPE_PCI) -+ ssb_pcicore_fix_sprom_core_index(pc); - - /* Disable PCI interrupts. */ -- ssb_write32(pc->dev, SSB_INTVEC, 0); -+ ssb_write32(pdev, SSB_INTVEC, 0); - - /* Additional PCIe always once-executed workarounds */ - if (pc->dev->id.coreid == SSB_DEV_PCIE) { --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -12,6 +12,7 @@ |