]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
staging/rtl8712 : Remove duplicated BIT() definitions
authorAnish Bhatt <anish7@gmail.com>
Wed, 9 Sep 2015 22:57:10 +0000 (15:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 13 Sep 2015 01:24:56 +0000 (18:24 -0700)
The BIT() macro is already defined in bitops.h,
remove duplicate definitions.

Signed-off-by: Anish Bhatt <anish@chelsio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8712/osdep_service.h
drivers/staging/rtl8712/wifi.h

index 0a7f58c59df521aab10911520a39810be8ff38b2..076d5083c723685839f7a1beab4880efeec22db4 100644 (file)
@@ -60,10 +60,6 @@ struct       __queue {
 #define LIST_CONTAINOR(ptr, type, member) \
        ((type *)((char *)(ptr)-(SIZE_T)(&((type *)0)->member)))
 
-#ifndef BIT
-       #define BIT(x)  (1 << (x))
-#endif
-
 static inline u32 _down_sema(struct semaphore *sema)
 {
        if (down_interruptible(sema))
index 67c6ebfaa1bbfbfcb472df787da9e83938534eb6..7a352c45344ff7e1e6915b716c9b5dc1463fbf0f 100644 (file)
 
 #include <linux/compiler.h>
 
-#ifdef BIT
-#undef BIT
-#endif
-#define BIT(x) (1 << (x))
-
 #define WLAN_IEEE_OUI_LEN      3
 #define WLAN_CRC_LEN           4
 #define WLAN_BSSID_LEN         6