aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx-2.6
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2007-06-26 20:19:19 +0000
committerPeter Denison <openwrt@marshadder.org>2007-06-26 20:19:19 +0000
commitdabbac5967d03ae0efdc423925d3783f8b63c626 (patch)
treea821958adf62531589c32cbc209f9c4c8595ac48 /target/linux/brcm47xx-2.6
parent08ddf77d71e13f25bf149ee3f5c2186be9d07b5e (diff)
downloadupstream-dabbac5967d03ae0efdc423925d3783f8b63c626.tar.gz
upstream-dabbac5967d03ae0efdc423925d3783f8b63c626.tar.bz2
upstream-dabbac5967d03ae0efdc423925d3783f8b63c626.zip
Remove ssb patch that was part of previous tree pull
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7737 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx-2.6')
-rw-r--r--target/linux/brcm47xx-2.6/patches-2.6.22/220-ssb_pci_deps.patch41
1 files changed, 0 insertions, 41 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
deleted file mode 100644
index 231c154dc3..0000000000
--- a/target/linux/brcm47xx-2.6/patches-2.6.22/220-ssb_pci_deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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;
- }
-