diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /drivers/usb/input/wacom.c | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/input/wacom.c')
| -rw-r--r-- | drivers/usb/input/wacom.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c index cf84c6096f2..369461a70b7 100644 --- a/drivers/usb/input/wacom.c +++ b/drivers/usb/input/wacom.c @@ -69,13 +69,10 @@ #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/input.h> #include <linux/module.h> #include <linux/init.h> -#include <linux/usb.h> -#include <linux/usb_input.h> +#include <linux/usb/input.h> #include <asm/unaligned.h> -#include <asm/byteorder.h> /* * Version Information |