aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.31
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-10-11 14:51:40 +0000
committerNicolas Thill <nico@openwrt.org>2009-10-11 14:51:40 +0000
commit35ae0abbe0e2d8713a0ddcb047b253371f99b213 (patch)
treedea113cd114feedb3edb9f78f9df94d91fd7e504 /target/linux/generic-2.6/patches-2.6.31
parent72dbf7cdcabf7d8c5ccda21ce3dccd28aeabcad8 (diff)
downloadupstream-35ae0abbe0e2d8713a0ddcb047b253371f99b213.tar.gz
upstream-35ae0abbe0e2d8713a0ddcb047b253371f99b213.tar.bz2
upstream-35ae0abbe0e2d8713a0ddcb047b253371f99b213.zip
ssb: remove reference to missing SDIO function from last 2.6.31 ssb update
SVN-Revision: 18033
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
index 8adb56d153..c3f179edb9 100644
--- a/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
@@ -237,17 +237,16 @@
}
--- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c
-@@ -175,6 +175,9 @@ static u32 scan_read32(struct ssb_bus *b
+@@ -175,6 +175,8 @@ static u32 scan_read32(struct ssb_bus *b
} else
ssb_pcmcia_switch_segment(bus, 0);
break;
+ case SSB_BUSTYPE_SDIO:
-+ offset += current_coreidx * SSB_CORE_SIZE;
-+ return ssb_sdio_scan_read32(bus, offset);
++ break;
}
return readl(bus->mmio + offset);
}
-@@ -188,6 +191,8 @@ static int scan_switchcore(struct ssb_bu
+@@ -188,6 +190,8 @@ static int scan_switchcore(struct ssb_bu
return ssb_pci_switch_coreidx(bus, coreidx);
case SSB_BUSTYPE_PCMCIA:
return ssb_pcmcia_switch_coreidx(bus, coreidx);
@@ -256,7 +255,7 @@
}
return 0;
}
-@@ -206,6 +211,8 @@ void ssb_iounmap(struct ssb_bus *bus)
+@@ -206,6 +210,8 @@ void ssb_iounmap(struct ssb_bus *bus)
SSB_BUG_ON(1); /* Can't reach this code. */
#endif
break;
@@ -265,7 +264,7 @@
}
bus->mmio = NULL;
bus->mapped_device = NULL;
-@@ -230,6 +237,8 @@ static void __iomem *ssb_ioremap(struct
+@@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct
SSB_BUG_ON(1); /* Can't reach this code. */
#endif
break;