diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 11:10:44 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 11:10:44 -0500 |
| commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
| tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /drivers/input/joystick/xpad.c | |
| parent | 8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9 (diff) | |
| parent | 497ab1f290a26fa9414c5c316515f1e2ddba0803 (diff) | |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'drivers/input/joystick/xpad.c')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 995e79fa7dad..603fe0dd3682 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | */ | 74 | */ |
| 75 | 75 | ||
| 76 | #include <linux/kernel.h> | 76 | #include <linux/kernel.h> |
| 77 | #include <linux/init.h> | ||
| 78 | #include <linux/slab.h> | 77 | #include <linux/slab.h> |
| 79 | #include <linux/stat.h> | 78 | #include <linux/stat.h> |
| 80 | #include <linux/module.h> | 79 | #include <linux/module.h> |