From 71d6dfcbf160db48849c5e176525effd44765412 Mon Sep 17 00:00:00 2001
From: Michael Buesch <mb@bu3sch.de>
Date: Sun, 24 Feb 2008 14:42:29 +0100
Subject: [PATCH] --- yaml --- r: 89970 b: refs/heads/master c:
 8f300ae5b819f7655197925cdb1954edfd906a87 h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/b43legacy/b43legacy.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3fea487a5d4d..08f367aa9115 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28de57d1a9eb7e67badb731297197fcbef0cc19e
+refs/heads/master: 8f300ae5b819f7655197925cdb1954edfd906a87
diff --git a/trunk/drivers/net/wireless/b43legacy/b43legacy.h b/trunk/drivers/net/wireless/b43legacy/b43legacy.h
index 6a63a6e474f7..242b8ad4e33c 100644
--- a/trunk/drivers/net/wireless/b43legacy/b43legacy.h
+++ b/trunk/drivers/net/wireless/b43legacy/b43legacy.h
@@ -343,7 +343,7 @@ enum {
 #else
 /* This will evaluate the argument even if debugging is disabled. */
 static inline bool __b43legacy_warn_on_dummy(bool x) { return x; }
-# define B43_WARN_ON(x)	__b43legacy_warn_on_dummy(unlikely(!!(x)))
+# define B43legacy_WARN_ON(x)	__b43legacy_warn_on_dummy(unlikely(!!(x)))
 # define B43legacy_BUG_ON(x)	do { /* nothing */ } while (0)
 # define B43legacy_DEBUG	0
 #endif