diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/mouse/Kconfig | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/input/mouse/Kconfig')
-rw-r--r-- | drivers/input/mouse/Kconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index c714ca2407f8..9c1e6ee83531 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig | |||
@@ -30,6 +30,7 @@ config MOUSE_PS2 | |||
30 | <http://w1.894.telia.com/~u89404340/touchpad/index.html> | 30 | <http://w1.894.telia.com/~u89404340/touchpad/index.html> |
31 | and a new version of GPM at: | 31 | and a new version of GPM at: |
32 | <http://www.geocities.com/dt_or/gpm/gpm.html> | 32 | <http://www.geocities.com/dt_or/gpm/gpm.html> |
33 | <http://xorg.freedesktop.org/archive/individual/driver/> | ||
33 | to take advantage of the advanced features of the touchpad. | 34 | to take advantage of the advanced features of the touchpad. |
34 | 35 | ||
35 | If unsure, say Y. | 36 | If unsure, say Y. |
@@ -38,7 +39,7 @@ config MOUSE_PS2 | |||
38 | module will be called psmouse. | 39 | module will be called psmouse. |
39 | 40 | ||
40 | config MOUSE_PS2_ALPS | 41 | config MOUSE_PS2_ALPS |
41 | bool "ALPS PS/2 mouse protocol extension" if EMBEDDED | 42 | bool "ALPS PS/2 mouse protocol extension" if EXPERT |
42 | default y | 43 | default y |
43 | depends on MOUSE_PS2 | 44 | depends on MOUSE_PS2 |
44 | help | 45 | help |
@@ -48,7 +49,7 @@ config MOUSE_PS2_ALPS | |||
48 | If unsure, say Y. | 49 | If unsure, say Y. |
49 | 50 | ||
50 | config MOUSE_PS2_LOGIPS2PP | 51 | config MOUSE_PS2_LOGIPS2PP |
51 | bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED | 52 | bool "Logitech PS/2++ mouse protocol extension" if EXPERT |
52 | default y | 53 | default y |
53 | depends on MOUSE_PS2 | 54 | depends on MOUSE_PS2 |
54 | help | 55 | help |
@@ -58,7 +59,7 @@ config MOUSE_PS2_LOGIPS2PP | |||
58 | If unsure, say Y. | 59 | If unsure, say Y. |
59 | 60 | ||
60 | config MOUSE_PS2_SYNAPTICS | 61 | config MOUSE_PS2_SYNAPTICS |
61 | bool "Synaptics PS/2 mouse protocol extension" if EMBEDDED | 62 | bool "Synaptics PS/2 mouse protocol extension" if EXPERT |
62 | default y | 63 | default y |
63 | depends on MOUSE_PS2 | 64 | depends on MOUSE_PS2 |
64 | help | 65 | help |
@@ -68,7 +69,7 @@ config MOUSE_PS2_SYNAPTICS | |||
68 | If unsure, say Y. | 69 | If unsure, say Y. |
69 | 70 | ||
70 | config MOUSE_PS2_LIFEBOOK | 71 | config MOUSE_PS2_LIFEBOOK |
71 | bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EMBEDDED | 72 | bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EXPERT |
72 | default y | 73 | default y |
73 | depends on MOUSE_PS2 && X86 && DMI | 74 | depends on MOUSE_PS2 && X86 && DMI |
74 | help | 75 | help |
@@ -78,7 +79,7 @@ config MOUSE_PS2_LIFEBOOK | |||
78 | If unsure, say Y. | 79 | If unsure, say Y. |
79 | 80 | ||
80 | config MOUSE_PS2_TRACKPOINT | 81 | config MOUSE_PS2_TRACKPOINT |
81 | bool "IBM Trackpoint PS/2 mouse protocol extension" if EMBEDDED | 82 | bool "IBM Trackpoint PS/2 mouse protocol extension" if EXPERT |
82 | default y | 83 | default y |
83 | depends on MOUSE_PS2 | 84 | depends on MOUSE_PS2 |
84 | help | 85 | help |