4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 571a68691a4a..4a917748fd9f 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -13,11 +13,11 @@ menuconfig INPUT_KEYBOARD
 if INPUT_KEYBOARD
 config KEYBOARD_ATKBD
-        tristate "AT keyboard" if !PC
+        tristate "AT keyboard" if !X86_PC
        default y
        select SERIO
        select SERIO_LIBPS2
-        select SERIO_I8042 if PC
+        select SERIO_I8042 if X86_PC
        select SERIO_GSCPS2 if GSC
        help
          Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
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>
diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c
index 7f06780a437f..9481132532d0 100644
--- a/drivers/input/keyboard/lkkbd.c
+++ b/drivers/input/keyboard/lkkbd.c
@@ -441,7 +441,7 @@ lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags,
                        input_sync (lk->dev);
                        break;
                case LK_METRONOME:
-                        DBG (KERN_INFO "Got %#d and don't "
+                        DBG (KERN_INFO "Got LK_METRONOME and don't "
                                        "know how to handle...\n");
                        break;
                case LK_OUTPUT_ERROR:
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index cee9c734a048..0fa38a559cdf 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.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>

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 571a68691a4a..4a917748fd9f 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig
@@ -13,11 +13,11 @@ menuconfig INPUT_KEYBOARD
13	if INPUT_KEYBOARD	13	if INPUT_KEYBOARD
14		14
15	config KEYBOARD_ATKBD	15	config KEYBOARD_ATKBD
16	tristate "AT keyboard" if !PC	16	tristate "AT keyboard" if !X86_PC
17	default y	17	default y
18	select SERIO	18	select SERIO
19	select SERIO_LIBPS2	19	select SERIO_LIBPS2
20	select SERIO_I8042 if PC	20	select SERIO_I8042 if X86_PC
21	select SERIO_GSCPS2 if GSC	21	select SERIO_GSCPS2 if GSC
22	help	22	help
23	Say Y here if you want to use a standard AT or PS/2 keyboard. Usually	23	Say Y here if you want to use a standard AT or PS/2 keyboard. Usually


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 @@
12	*/	12	*/
13		13
14	#include <linux/delay.h>	14	#include <linux/delay.h>
15	#include <linux/device.h>	15	#include <linux/platform_device.h>
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <linux/input.h>	17	#include <linux/input.h>
18	#include <linux/interrupt.h>	18	#include <linux/interrupt.h>


diff --git a/drivers/input/keyboard/lkkbd.c b/drivers/input/keyboard/lkkbd.c index 7f06780a437f..9481132532d0 100644 --- a/drivers/input/keyboard/lkkbd.c +++ b/drivers/input/keyboard/lkkbd.c
@@ -441,7 +441,7 @@ lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags,
441	input_sync (lk->dev);	441	input_sync (lk->dev);
442	break;	442	break;
443	case LK_METRONOME:	443	case LK_METRONOME:
444	DBG (KERN_INFO "Got %#d and don't "	444	DBG (KERN_INFO "Got LK_METRONOME and don't "
445	"know how to handle...\n");	445	"know how to handle...\n");
446	break;	446	break;
447	case LK_OUTPUT_ERROR:	447	case LK_OUTPUT_ERROR:


diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index cee9c734a048..0fa38a559cdf 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c
@@ -12,7 +12,7 @@
12	*/	12	*/
13		13
14	#include <linux/delay.h>	14	#include <linux/delay.h>
15	#include <linux/device.h>	15	#include <linux/platform_device.h>
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <linux/input.h>	17	#include <linux/input.h>
18	#include <linux/interrupt.h>	18	#include <linux/interrupt.h>