diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 16:25:08 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 16:25:08 +0200 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /drivers/usb/storage/onetouch.c | |
| parent | [GFS2] Eliminate one instance of __GFP_NOFAIL (diff) | |
| parent | [PATCH] genirq: Fixup ARM devel merge (diff) | |
| download | linux-0a1340c185734a57fbf4775927966ad4a1347b02.tar.xz linux-0a1340c185734a57fbf4775927966ad4a1347b02.zip | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'drivers/usb/storage/onetouch.c')
| -rw-r--r-- | drivers/usb/storage/onetouch.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c index 55ee2d36d585..313920d980c9 100644 --- a/drivers/usb/storage/onetouch.c +++ b/drivers/usb/storage/onetouch.c @@ -28,15 +28,13 @@ * */ -#include <linux/config.h> #include <linux/kernel.h> #include <linux/input.h> #include <linux/init.h> #include <linux/slab.h> #include <linux/module.h> -#include <linux/usb.h> #include <linux/usb_ch9.h> -#include <linux/usb_input.h> +#include <linux/usb/input.h> #include "usb.h" #include "onetouch.h" #include "debug.h" |