---

yaml --- r: 219837 b: refs/heads/master c: 5fee254 h: refs/heads/master i: 219835: fd3a828 v: v3
git-mirror · Sep 14, 2010 · 45dc133 · 45dc133
1 parent bcf0341
commit 45dc133
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92dfc7d18a123fcf22beaf23036ba02a13416e3e
+refs/heads/master: 5fee254098c11a52ce04e1efdc8c090caf592bfd
diff --git a/trunk/drivers/staging/brcm80211/include/bcmutils.h b/trunk/drivers/staging/brcm80211/include/bcmutils.h
@@ -415,15 +415,15 @@ extern "C" {
 }
 
 #ifndef ABS
-#define	ABS(a)			(((a) < 0) ? -(a):(a))
+#define	ABS(a)			(((a) < 0) ? -(a) : (a))
 #endif				/* ABS */
 
 #ifndef MIN
-#define	MIN(a, b)		(((a) < (b)) ? (a):(b))
+#define	MIN(a, b)		(((a) < (b)) ? (a) : (b))
 #endif				/* MIN */
 
 #ifndef MAX
-#define	MAX(a, b)		(((a) > (b)) ? (a):(b))
+#define	MAX(a, b)		(((a) > (b)) ? (a) : (b))
 #endif				/* MAX */
 
 #define CEIL(x, y)		(((x) + ((y)-1)) / (y))

diff --git a/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -1611,14 +1611,14 @@ static void __devexit wl_remove(struct pci_dev *pdev)
 }
 
 static struct pci_driver wl_pci_driver = {
- name:	"brcm80211",
- probe: wl_pci_probe,
+ .name  = "brcm80211",
+ .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,
 };
 #endif				/* !BCMSDIO */