summaryrefslogtreecommitdiffstats
path: root/drivers/usb/hid.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-03-13 20:55:15 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-03-13 20:55:15 +0000
commit1471f525455788c20b130690e0f104df451aeb43 (patch)
tree3778beba56558beb9a9548ea5b467e9c44ea966f /drivers/usb/hid.c
parente80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff)
Merge with Linux 2.3.51.
Diffstat (limited to 'drivers/usb/hid.c')
-rw-r--r--drivers/usb/hid.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/hid.c b/drivers/usb/hid.c
index 3f98d9b14..c7bb34e4d 100644
--- a/drivers/usb/hid.c
+++ b/drivers/usb/hid.c
@@ -39,13 +39,12 @@
#include <linux/mm.h>
#include <linux/smp_lock.h>
#include <linux/spinlock.h>
-
-#include <asm/unaligned.h>
-
#undef DEBUG
#undef DEBUG_DATA
+#include <linux/usb.h>
+
+#include <asm/unaligned.h>
-#include "usb.h"
#include "hid.h"
#ifdef DEBUG