summaryrefslogtreecommitdiff
path: root/drivers/input/keyboard/corgikbd.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-02 15:20:55 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-02 15:20:55 +1100
commitde2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch)
treedfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/input/keyboard/corgikbd.c
parent104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff)
parentdf70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff)
Merge ../linux-2.6
Diffstat (limited to 'drivers/input/keyboard/corgikbd.c')
-rw-r--r--drivers/input/keyboard/corgikbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 3210d298b3bc..d00d14bb637a 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -12,7 +12,7 @@
*/
#include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/input.h>
#include <linux/interrupt.h>