diff options
| author | Ingo Molnar | 2010-05-03 09:17:01 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2010-05-03 09:17:01 +0200 |
| commit | 53ba4f2fa73225113a488584df0d85d3cba52943 (patch) | |
| tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /drivers/input/gameport | |
| parent | lockstat: Make lockstat counting per cpu (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | kernel-qcow2-linux-53ba4f2fa73225113a488584df0d85d3cba52943.tar.gz kernel-qcow2-linux-53ba4f2fa73225113a488584df0d85d3cba52943.tar.xz kernel-qcow2-linux-53ba4f2fa73225113a488584df0d85d3cba52943.zip | |
Merge commit 'v2.6.34-rc6' into core/locking
Diffstat (limited to 'drivers/input/gameport')
| -rw-r--r-- | drivers/input/gameport/lightning.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/gameport/lightning.c b/drivers/input/gameport/lightning.c index 06ad36ed3483..85d6ee09f11f 100644 --- a/drivers/input/gameport/lightning.c +++ b/drivers/input/gameport/lightning.c @@ -34,7 +34,6 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/gameport.h> -#include <linux/slab.h> #define L4_PORT 0x201 #define L4_SELECT_ANALOG 0xa4 |