From 201ffb641871c6ef2b27667920bb8544bfeca697 Mon Sep 17 00:00:00 2001
From: Mike Rapoport <mike.rapoport@gmail.com>
Date: Sun, 14 Nov 2010 13:36:23 +0200
Subject: [PATCH] --- yaml --- r: 228114 b: refs/heads/master c:
 ae0d9ebaffe47ed553e715ab5243660c33b6338c h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 .../staging/brcm80211/brcmfmac/bcmsdh_linux.c   | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index ec045668de64..bc15dc5ef9ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b93a8b8e0514ebacb49a50c67a8846139bcd1bd
+refs/heads/master: ae0d9ebaffe47ed553e715ab5243660c33b6338c
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index be33696b8f74..b021d97e59fa 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -137,17 +137,6 @@ static int __devinit bcmsdh_probe(struct device *dev);
 static int __devexit bcmsdh_remove(struct device *dev);
 #endif				/* BCMLXSDMMC */
 
-#ifndef BCMLXSDMMC
-static struct device_driver bcmsdh_driver = {
-	.name = "pxa2xx-mci",
-	.bus = &platform_bus_type,
-	.probe = bcmsdh_probe,
-	.remove = bcmsdh_remove,
-	.suspend = NULL,
-	.resume = NULL,
-};
-#endif				/* BCMLXSDMMC */
-
 #ifndef BCMLXSDMMC
 static
 #endif				/* BCMLXSDMMC */
@@ -522,9 +511,6 @@ int bcmsdh_register(bcmsdh_driver_t *driver)
 #if defined(BCMLXSDMMC)
 	SDLX_MSG(("Linux Kernel SDIO/MMC Driver\n"));
 	error = sdio_function_init();
-#else
-	SDLX_MSG(("Intel PXA270 SDIO Driver\n"));
-	error = driver_register(&bcmsdh_driver);
 #endif				/* defined(BCMLXSDMMC) */
 	return error;
 #endif				/* defined(BCMPLATFORM_BUS) */
@@ -544,9 +530,6 @@ extern void sdio_function_cleanup(void);
 
 void bcmsdh_unregister(void)
 {
-#if defined(BCMPLATFORM_BUS) && !defined(BCMLXSDMMC)
-		driver_unregister(&bcmsdh_driver);
-#endif
 #if defined(BCMLXSDMMC)
 	sdio_function_cleanup();
 #endif				/* BCMLXSDMMC */