diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:38:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:38:14 -0400 |
| commit | ce1d5b23a8d1e19866ab82bdec0dc41fde5273d8 (patch) | |
| tree | 028c80655ee8853ebf607d435bc3d6ab223aef1f /drivers/input/tablet/Kconfig | |
| parent | ad5e1b0f5d913d2c8bddfba81049cc07228da1a6 (diff) | |
| parent | 308f0a5898033691d050374a949bbfe173987a16 (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: (40 commits)
Input: wacom - add support for Cintiq 20WSX
Input: ucb1400_ts - IRQ probe fix
Input: at32psif - update MODULE_AUTHOR with new email
Input: mac_hid - add lockdep annotation to emumousebtn
Input: i8042 - fix incorrect usage of strncpy and strncat
Input: bf54x-keys - add infrastructure for keypad wakeups
Input: add MODULE_ALIAS() to hotpluggable platform modules
Input: drivers/char/keyboard.c - use time_after
Input: fix ordering in joystick Makefile
Input: wm97xx-core - support use as a wakeup source
Input: wm97xx-core - use IRQF_SAMPLE_RANDOM
Input: wm97xx-core - only schedule interrupt handler if not already scheduled
Input: add Zhen Hua driver
Input: aiptek - add support for Genius G-PEN 560 tablet
Input: wacom - implement suspend and autosuspend
Input: xpad - set proper buffer length for outgoing requests
Input: omap-keypad - fix build warning
Input: gpio_keys - irq handling cleanup
Input: add PS/2 serio driver for AVR32 devices
Input: put ledstate in the keyboard notifier
...
Diffstat (limited to 'drivers/input/tablet/Kconfig')
| -rw-r--r-- | drivers/input/tablet/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig index d371c0bdc0bd..effb49ea24aa 100644 --- a/drivers/input/tablet/Kconfig +++ b/drivers/input/tablet/Kconfig | |||
| @@ -25,14 +25,14 @@ config TABLET_USB_ACECAD | |||
| 25 | module will be called acecad. | 25 | module will be called acecad. |
| 26 | 26 | ||
| 27 | config TABLET_USB_AIPTEK | 27 | config TABLET_USB_AIPTEK |
| 28 | tristate "Aiptek 6000U/8000U tablet support (USB)" | 28 | tristate "Aiptek 6000U/8000U and Genius G_PEN tablet support (USB)" |
| 29 | depends on USB_ARCH_HAS_HCD | 29 | depends on USB_ARCH_HAS_HCD |
| 30 | select USB | 30 | select USB |
| 31 | help | 31 | help |
| 32 | Say Y here if you want to use the USB version of the Aiptek 6000U | 32 | Say Y here if you want to use the USB version of the Aiptek 6000U, |
| 33 | or Aiptek 8000U tablet. Make sure to say Y to "Mouse support" | 33 | Aiptek 8000U or Genius G-PEN 560 tablet. Make sure to say Y to |
| 34 | (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support" | 34 | "Mouse support" (CONFIG_INPUT_MOUSEDEV) and/or "Event interface |
| 35 | (CONFIG_INPUT_EVDEV) as well. | 35 | support" (CONFIG_INPUT_EVDEV) as well. |
| 36 | 36 | ||
| 37 | To compile this driver as a module, choose M here: the | 37 | To compile this driver as a module, choose M here: the |
| 38 | module will be called aiptek. | 38 | module will be called aiptek. |