From 2a74d4696ecf732265095660663a446a829f2823 Mon Sep 17 00:00:00 2001 From: Arthur Othieno Date: Sun, 30 Oct 2005 23:04:05 -0500 Subject: [PATCH] --- yaml --- r: 11985 b: refs/heads/master c: f2c84c0e84bfa637a7161eac10157cf3b05b4a73 h: refs/heads/master i: 11983: 686e31c07ad7dff59f01bbb42339c3f310fde770 v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 5 ----- trunk/drivers/input/keyboard/Kconfig | 4 ++-- trunk/drivers/input/mouse/Kconfig | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index c3c8d3bec4eb..90a56690826d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 581c1b14394aee60aff46ea67d05483261ed6527 +refs/heads/master: f2c84c0e84bfa637a7161eac10157cf3b05b4a73 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index 5383e5e2d9b7..bac0da731ee3 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -1042,8 +1042,3 @@ config X86_TRAMPOLINE bool depends on X86_SMP || (X86_VOYAGER && SMP) default y - -config PC - bool - depends on X86 && !EMBEDDED - default y diff --git a/trunk/drivers/input/keyboard/Kconfig b/trunk/drivers/input/keyboard/Kconfig index 571a68691a4a..4a917748fd9f 100644 --- a/trunk/drivers/input/keyboard/Kconfig +++ b/trunk/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/trunk/drivers/input/mouse/Kconfig b/trunk/drivers/input/mouse/Kconfig index 537154dd7a87..574b18a523af 100644 --- a/trunk/drivers/input/mouse/Kconfig +++ b/trunk/drivers/input/mouse/Kconfig @@ -17,7 +17,7 @@ config MOUSE_PS2 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 have a PS/2 mouse connected to your system. This