diff options
| author | Anish Bhatt <anish7@gmail.com> | 2015-09-09 15:57:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-12 18:24:56 -0700 |
| commit | 4c021dc0b8722365e9aee06d7a2213b5d93075c7 (patch) | |
| tree | 0ab2288d5570bf9ade1d77e40d898f86187787bd /drivers/staging/rtl8712 | |
| parent | 27934f362a90039b8cd9e48721ace549fd2ae417 (diff) | |
| download | talos-obmc-linux-4c021dc0b8722365e9aee06d7a2213b5d93075c7.tar.gz talos-obmc-linux-4c021dc0b8722365e9aee06d7a2213b5d93075c7.zip | |
staging/rtl8712 : Remove duplicated BIT() definitions
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>
Diffstat (limited to 'drivers/staging/rtl8712')
| -rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8712/wifi.h | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 0a7f58c59df5..076d5083c723 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -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)) diff --git a/drivers/staging/rtl8712/wifi.h b/drivers/staging/rtl8712/wifi.h index 67c6ebfaa1bb..7a352c45344f 100644 --- a/drivers/staging/rtl8712/wifi.h +++ b/drivers/staging/rtl8712/wifi.h @@ -28,11 +28,6 @@ #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 |
