diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:27:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:27:33 -0400 |
| commit | 0b662c64840fb281e5948ab6f9d60f84817277d0 (patch) | |
| tree | 169f6bf2c3c9f3a7a69b0ee3785cfcd866e12329 /drivers/input/mouse | |
| parent | 45efebf2492187e8915e2876c5bf6f3803b1c23f (diff) | |
| parent | 1dfa2812404c37d7571622195f907cea3331616c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: reduce raciness when input handlers disconnect
Input: ucb1x00 - do not access input_dev->private directly
Input: logips2pp - fix typo in Kconfig
Input: db9 - do not ignore dev2 module parameter
Diffstat (limited to 'drivers/input/mouse')
| -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 eb0167e9f0cb..50e06e8dd05d 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig | |||
| @@ -48,7 +48,7 @@ config MOUSE_PS2_ALPS | |||
| 48 | If unsure, say Y. | 48 | If unsure, say Y. |
| 49 | 49 | ||
| 50 | config MOUSE_PS2_LOGIPS2PP | 50 | config MOUSE_PS2_LOGIPS2PP |
| 51 | bool "Logictech PS/2++ mouse protocol extension" if EMBEDDED | 51 | bool "Logitech PS/2++ mouse protocol extension" if EMBEDDED |
| 52 | default y | 52 | default y |
| 53 | depends on MOUSE_PS2 | 53 | depends on MOUSE_PS2 |
| 54 | help | 54 | help |