Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus

[~andy/linux] / drivers / input / joydev.c

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index c24ec2d5f9266cb969bd3a73ea229c08adcc8d9b..26043cc6a0165f80a36e7ee31436cc128a318de1 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -13,7 +13,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <asm/io.h>
-#include <asm/system.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/joystick.h>