aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/gameport
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-05-03 09:17:01 +0200
committerIngo Molnar <mingo@elte.hu>2010-05-03 09:17:01 +0200
commit53ba4f2fa73225113a488584df0d85d3cba52943 (patch)
treed85b984d9818abc3ccc0237eb53b710d9e96c39e /drivers/input/gameport
parentbd6d29c25bb1a24a4c160ec5de43e0004e01f72b (diff)
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff)
downloadkernel_samsung_tuna-53ba4f2fa73225113a488584df0d85d3cba52943.zip
kernel_samsung_tuna-53ba4f2fa73225113a488584df0d85d3cba52943.tar.gz
kernel_samsung_tuna-53ba4f2fa73225113a488584df0d85d3cba52943.tar.bz2
Merge commit 'v2.6.34-rc6' into core/locking
Diffstat (limited to 'drivers/input/gameport')
-rw-r--r--drivers/input/gameport/lightning.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/gameport/lightning.c b/drivers/input/gameport/lightning.c
index 06ad36e..85d6ee0 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