aboutsummaryrefslogtreecommitdiffstats
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
commit13790041c140c07d4b247939c3e8de563ab2f20f (patch)
tree5e6dbfcd88a21cb9fad2c657af5e4dc57d2972d1
parent86e1d1978ecec8fabe24ec5ec792d7b1b0fa1389 (diff)
downloadupstream-13790041c140c07d4b247939c3e8de563ab2f20f.tar.gz
upstream-13790041c140c07d4b247939c3e8de563ab2f20f.tar.bz2
upstream-13790041c140c07d4b247939c3e8de563ab2f20f.zip
Remove ssb patch that was part of previous tree pull
SVN-Revision: 7737
-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;
- }
-