From 9215190b421dea36764bb3fd29e229c7d2efdd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Thu, 5 May 2011 12:45:52 +0200
Subject: [PATCH] --- yaml --- r: 247551 b: refs/heads/master c:
 fc2b1e0cfe9b4cabde8afeacc2bb81a95bf83afb h: refs/heads/master i:   247549:
 85236b22a0771ee9785e54effc631e46f7b0d709   247547:
 fd108a7aa55ca411297eb6cef64096ccf89899ba   247543:
 396bf398f30172f8857bd8d7c2d72db2462182de   247535:
 57ed5a22cd8f8c333a719c41a4615aed677e6b12   247519:
 bb633c94a207e71cc2c3f24b079cb2a050b71e8e   247487:
 a9e66ff60366fbbf4a45bf67716add3a93706ced   247423:
 823a5dba79fe06a279b72942560cec2a519636cc   247295:
 ddc2250c765146c6c60a2e05330de1b16141c66f v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/net/wireless/b43/main.c | 28 +--------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 979153f6d523..7a54d1b03782 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf3a03b9c99a0b2715741d116f50f513f545bb2d
+refs/heads/master: fc2b1e0cfe9b4cabde8afeacc2bb81a95bf83afb
diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c
index 57eb5b649730..675e288a3c53 100644
--- a/trunk/drivers/net/wireless/b43/main.c
+++ b/trunk/drivers/net/wireless/b43/main.c
@@ -4212,33 +4212,7 @@ static void b43_bluetooth_coext_disable(struct b43_wldev *dev)
 
 static void b43_imcfglo_timeouts_workaround(struct b43_wldev *dev)
 {
-#ifdef CONFIG_SSB_DRIVER_PCICORE
-	struct ssb_bus *bus = dev->dev->bus;
-	u32 tmp;
-
-	if (bus->pcicore.dev &&
-	    bus->pcicore.dev->id.coreid == SSB_DEV_PCI &&
-	    bus->pcicore.dev->id.revision <= 5) {
-		/* IMCFGLO timeouts workaround. */
-		tmp = ssb_read32(dev->dev, SSB_IMCFGLO);
-		switch (bus->bustype) {
-		case SSB_BUSTYPE_PCI:
-		case SSB_BUSTYPE_PCMCIA:
-			tmp &= ~SSB_IMCFGLO_REQTO;
-			tmp &= ~SSB_IMCFGLO_SERTO;
-			tmp |= 0x32;
-			break;
-		case SSB_BUSTYPE_SSB:
-			tmp &= ~SSB_IMCFGLO_REQTO;
-			tmp &= ~SSB_IMCFGLO_SERTO;
-			tmp |= 0x53;
-			break;
-		default:
-			break;
-		}
-		ssb_write32(dev->dev, SSB_IMCFGLO, tmp);
-	}
-#endif /* CONFIG_SSB_DRIVER_PCICORE */
+	/* TODO: implement 80211 core workaround here */
 }
 
 static void b43_set_synth_pu_delay(struct b43_wldev *dev, bool idle)