diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 17:54:28 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-20 17:54:28 +0400 |
| commit | d4263348f796f29546f90802177865dd4379dd0a (patch) | |
| tree | adcbdaebae584eee2f32fab95e826e8e49eef385 /drivers/input/joystick/cobra.c | |
| parent | be873ac782f5ff5ee6675f83929f4fe6737eead2 (diff) | |
| parent | 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff) | |
| download | linux-d4263348f796f29546f90802177865dd4379dd0a.tar.xz | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/input/joystick/cobra.c')
| -rw-r--r-- | drivers/input/joystick/cobra.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c index 65367e44d715..ae3ee24a2368 100644 --- a/drivers/input/joystick/cobra.c +++ b/drivers/input/joystick/cobra.c @@ -29,7 +29,6 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/init.h> #include <linux/gameport.h> #include <linux/input.h> #include <linux/jiffies.h> |