From 3ab3fc3f9884dcd4370a4b34481e8efa9998ca56 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Fri, 21 Jan 2011 10:54:52 +0100
Subject: [PATCH] --- yaml --- r: 235635 b: refs/heads/master c:
 c836f77fdba3631e295e3da1718ab53a9038fdf2 h: refs/heads/master i:   235633:
 66daa332fde9bce78eba14685b961f0277e239df   235631:
 fa2d1b4d24fc0a611f7c13a97e15f065f0b21055 v: v3

---
 [refs]                                               |  2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c |  2 +-
 .../drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 09aec9728d62..3463529fde00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8941ea65ac3e0200e960957125be50f245d164c
+refs/heads/master: c836f77fdba3631e295e3da1718ab53a9038fdf2
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 28ddf1b69aac..29fff596c168 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -149,7 +149,7 @@ static struct platform_driver wifi_device = {
 	.suspend = wifi_suspend,
 	.resume = wifi_resume,
 	.driver = {
-		   .name = "bcm4329_wlan",
+		   .name = KBUILD_MODNAME,
 		   }
 };
 
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 6bc6207bab3e..f9ba048837be 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1184,14 +1184,14 @@ static void wl_remove(struct pci_dev *pdev)
 }
 
 static struct pci_driver wl_pci_driver = {
- .name  = "brcm80211",
- .probe = wl_pci_probe,
+	.name  = KBUILD_MODNAME,
+	.probe = wl_pci_probe,
 #ifdef LINUXSTA_PS
- .suspend = wl_suspend,
- .resume  = wl_resume,
+	.suspend = wl_suspend,
+	.resume  = wl_resume,
 #endif				/* LINUXSTA_PS */
- .remove   = __devexit_p(wl_remove),
- .id_table = wl_id_table,
+	.remove   = __devexit_p(wl_remove),
+	.id_table = wl_id_table,
 };
 
 /**