diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-10-19 02:40:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:42 -0400 |
commit | 93043ece030af58529e3e1367502461d265ab4e2 (patch) | |
tree | 48add1b72e3ebd07866089c88ad6122422f1da55 /drivers/net | |
parent | 7b19ada2ed3c1eccb9fe94d74b05e1428224663d (diff) |
define global BIT macro
define global BIT macro
move all local BIT defines to the new globally define macro.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Kumar Gala <galak@gate.crashing.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/eth16i.c | 1 | ||||
-rw-r--r-- | drivers/net/meth.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_common.h | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index 243fc6b354b5..e3dd8b136908 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c | |||
@@ -170,7 +170,6 @@ static char *version = | |||
170 | 170 | ||
171 | 171 | ||
172 | /* Few macros */ | 172 | /* Few macros */ |
173 | #define BIT(a) ( (1 << (a)) ) | ||
174 | #define BITSET(ioaddr, bnum) ((outb(((inb(ioaddr)) | (bnum)), ioaddr))) | 173 | #define BITSET(ioaddr, bnum) ((outb(((inb(ioaddr)) | (bnum)), ioaddr))) |
175 | #define BITCLR(ioaddr, bnum) ((outb(((inb(ioaddr)) & (~(bnum))), ioaddr))) | 174 | #define BITCLR(ioaddr, bnum) ((outb(((inb(ioaddr)) & (~(bnum))), ioaddr))) |
176 | 175 | ||
diff --git a/drivers/net/meth.h b/drivers/net/meth.h index ea3b8fc86d1e..a78dc1ca8c29 100644 --- a/drivers/net/meth.h +++ b/drivers/net/meth.h | |||
@@ -28,9 +28,6 @@ | |||
28 | #define RX_BUFFER_OFFSET (sizeof(rx_status_vector)+2) /* staus vector + 2 bytes of padding */ | 28 | #define RX_BUFFER_OFFSET (sizeof(rx_status_vector)+2) /* staus vector + 2 bytes of padding */ |
29 | #define RX_BUCKET_SIZE 256 | 29 | #define RX_BUCKET_SIZE 256 |
30 | 30 | ||
31 | #undef BIT | ||
32 | #define BIT(x) (1UL << (x)) | ||
33 | |||
34 | /* For more detailed explanations of what each field menas, | 31 | /* For more detailed explanations of what each field menas, |
35 | see Nick's great comments to #defines below (or docs, if | 32 | see Nick's great comments to #defines below (or docs, if |
36 | you are lucky enough toget hold of them :)*/ | 33 | you are lucky enough toget hold of them :)*/ |
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h index ceb7f1e5e9e0..517f89845144 100644 --- a/drivers/net/wireless/hostap/hostap_common.h +++ b/drivers/net/wireless/hostap/hostap_common.h | |||
@@ -4,9 +4,6 @@ | |||
4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
5 | #include <linux/if_ether.h> | 5 | #include <linux/if_ether.h> |
6 | 6 | ||
7 | #define BIT(x) (1 << (x)) | ||
8 | |||
9 | |||
10 | /* IEEE 802.11 defines */ | 7 | /* IEEE 802.11 defines */ |
11 | 8 | ||
12 | /* Information Element IDs */ | 9 | /* Information Element IDs */ |