diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:44:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 10:45:01 -0500 |
| commit | f0ef03985130287c6c84ebe69416cf790e6cc00e (patch) | |
| tree | 3ecb04cc4d82e5fc3ae5f1747e6da172ae8cbcb7 /drivers/input/mouse/Kconfig | |
| parent | 16097439703bcd38e9fe5608c12add6dacb825ea (diff) | |
| parent | 31bbed527e7039203920c51c9fb48c27aed0820c (diff) | |
Merge branch 'x86/core' into tracing/textedit
Conflicts:
arch/x86/Kconfig
block/blktrace.c
kernel/irq/handle.c
Semantic conflict:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/mouse/Kconfig')
| -rw-r--r-- | drivers/input/mouse/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 9705f3a00a3d..4f38e6f7dfdd 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig | |||
| @@ -17,7 +17,7 @@ config MOUSE_PS2 | |||
| 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 X86_PC | 20 | select SERIO_I8042 if X86 |
| 21 | select SERIO_GSCPS2 if GSC | 21 | select SERIO_GSCPS2 if GSC |
| 22 | help | 22 | help |
| 23 | Say Y here if you have a PS/2 mouse connected to your system. This | 23 | Say Y here if you have a PS/2 mouse connected to your system. This |