aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2007-06-22 22:38:09 +0000
committerPeter Denison <openwrt@marshadder.org>2007-06-22 22:38:09 +0000
commit2e3c3918f2d81a8a4af30ecb44454ae326c8d7bd (patch)
tree960ec93a797de330838e11b8fc9900f86ad8256b
parentfdc53d7e065684729dd1890ceb9d02c57621b987 (diff)
downloadupstream-2e3c3918f2d81a8a4af30ecb44454ae326c8d7bd.tar.gz
upstream-2e3c3918f2d81a8a4af30ecb44454ae326c8d7bd.tar.bz2
upstream-2e3c3918f2d81a8a4af30ecb44454ae326c8d7bd.zip
Fix brcm43xx build for PCI-less systems (patch from Michael Buesch)
SVN-Revision: 7711
-rw-r--r--target/linux/brcm47xx-2.6/patches-2.6.22/220-ssb_pci_deps.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/220-ssb_pci_deps.patch b/target/linux/brcm47xx-2.6/patches-2.6.22/220-ssb_pci_deps.patch
new file mode 100644
index 0000000000..231c154dc3
--- /dev/null
+++ b/target/linux/brcm47xx-2.6/patches-2.6.22/220-ssb_pci_deps.patch
@@ -0,0 +1,41 @@
+From: Michael Buesch <mb@bu3sch.de>
+Date: Fri, 22 Jun 2007 22:13:00 +0000 (+0200)
+Subject: bcm43xx-mac80211: Fix build for PCI-less systems.
+X-Git-Url: http://bu3sch.de/gitweb?p=wireless-dev.git;a=commitdiff_plain;h=edd2b9cc18cf2eb15ea35d34af556b614f07114b
+
+bcm43xx-mac80211: Fix build for PCI-less systems.
+
+pci_iomap() and pci_iounmap() are not available if PCI
+support is disabled.
+
+Signed-off-by: Michael Buesch <mb@bu3sch.de>
+---
+
+diff --git a/drivers/ssb/scan.c b/drivers/ssb/scan.c
+index feaf1e5..b5d909c 100644
+--- a/drivers/ssb/scan.c
++++ b/drivers/ssb/scan.c
+@@ -202,7 +202,11 @@ void ssb_iounmap(struct ssb_bus *bus)
+ iounmap(bus->mmio);
+ break;
+ case SSB_BUSTYPE_PCI:
++#ifdef CONFIG_SSB_PCIHOST
+ pci_iounmap(bus->host_pci, bus->mmio);
++#else
++ assert(0); /* Can't reach this code. */
++#endif
+ break;
+ }
+ bus->mmio = NULL;
+@@ -222,7 +226,11 @@ static void __iomem * ssb_ioremap(struct ssb_bus *bus,
+ mmio = ioremap(baseaddr, SSB_CORE_SIZE);
+ break;
+ case SSB_BUSTYPE_PCI:
++#ifdef CONFIG_SSB_PCIHOST
+ mmio = pci_iomap(bus->host_pci, 0, ~0UL);
++#else
++ assert(0); /* Can't reach this code. */
++#endif
+ break;
+ }
+