diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2007-10-19 02:40:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 14:53:42 -0400 |
commit | 7b19ada2ed3c1eccb9fe94d74b05e1428224663d (patch) | |
tree | a0c5975ce5236ff4023b92d431bd0a8fa321c6ce /include/linux/uinput.h | |
parent | d05be13bcc6ec615fb2e9556a9b85d52800669b6 (diff) |
get rid of input BIT* duplicate defines
get rid of input BIT* duplicate defines
use newly global defined macros for input layer. Also remove includes of
input.h from non-input sources only for BIT macro definiton. Define the
macro temporarily in local manner, all those local definitons will be
removed further in this patchset (to not break bisecting).
BIT macro will be globally defined (1<<x)
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: <dtor@mail.ru>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Cc: <lenb@kernel.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Cc: <perex@suse.cz>
Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: <vernux@us.ibm.com>
Cc: <malattia@linux.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/uinput.h')
-rw-r--r-- | include/linux/uinput.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h index a6c1e8eed226..15ddd4483b09 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h | |||
@@ -162,10 +162,6 @@ struct uinput_ff_erase { | |||
162 | #define UI_FF_UPLOAD 1 | 162 | #define UI_FF_UPLOAD 1 |
163 | #define UI_FF_ERASE 2 | 163 | #define UI_FF_ERASE 2 |
164 | 164 | ||
165 | #ifndef NBITS | ||
166 | #define NBITS(x) ((((x)-1)/(sizeof(long)*8))+1) | ||
167 | #endif /* NBITS */ | ||
168 | |||
169 | #define UINPUT_MAX_NAME_SIZE 80 | 165 | #define UINPUT_MAX_NAME_SIZE 80 |
170 | struct uinput_user_dev { | 166 | struct uinput_user_dev { |
171 | char name[UINPUT_MAX_NAME_SIZE]; | 167 | char name[UINPUT_MAX_NAME_SIZE]; |