diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/usb/input/xpad.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/usb/input/xpad.c')
| -rw-r--r-- | drivers/usb/input/xpad.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/input/xpad.c b/drivers/usb/input/xpad.c index e278489a80c6..cfd4a4e04334 100644 --- a/drivers/usb/input/xpad.c +++ b/drivers/usb/input/xpad.c | |||
| @@ -56,13 +56,11 @@ | |||
| 56 | 56 | ||
| 57 | #include <linux/config.h> | 57 | #include <linux/config.h> |
| 58 | #include <linux/kernel.h> | 58 | #include <linux/kernel.h> |
| 59 | #include <linux/input.h> | ||
| 60 | #include <linux/init.h> | 59 | #include <linux/init.h> |
| 61 | #include <linux/slab.h> | 60 | #include <linux/slab.h> |
| 62 | #include <linux/module.h> | 61 | #include <linux/module.h> |
| 63 | #include <linux/smp_lock.h> | 62 | #include <linux/smp_lock.h> |
| 64 | #include <linux/usb.h> | 63 | #include <linux/usb/input.h> |
| 65 | #include <linux/usb_input.h> | ||
| 66 | 64 | ||
| 67 | #define DRIVER_VERSION "v0.0.5" | 65 | #define DRIVER_VERSION "v0.0.5" |
| 68 | #define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>" | 66 | #define DRIVER_AUTHOR "Marko Friedemann <mfr@bmx-chemnitz.de>" |