Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / input / tablet / Kconfig

diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig
index 12dfb0e..58a8775 100644 (file)
--- a/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
@@ -13,6 +13,7 @@ if INPUT_TABLET
 
 config TABLET_USB_ACECAD
        tristate "Acecad Flair tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the USB version of the Acecad Flair
@@ -24,13 +25,14 @@ config TABLET_USB_ACECAD
          module will be called acecad.
 
 config TABLET_USB_AIPTEK
-       tristate "Aiptek 6000U/8000U tablet support (USB)"
+       tristate "Aiptek 6000U/8000U and Genius G_PEN tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
-         Say Y here if you want to use the USB version of the Aiptek 6000U
-         or Aiptek 8000U tablet.  Make sure to say Y to "Mouse support"
-         (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
-         (CONFIG_INPUT_EVDEV) as well.
+         Say Y here if you want to use the USB version of the Aiptek 6000U,
+         Aiptek 8000U or Genius G-PEN 560 tablet.  Make sure to say Y to
+         "Mouse support" (CONFIG_INPUT_MOUSEDEV) and/or "Event interface
+         support" (CONFIG_INPUT_EVDEV) as well.
 
          To compile this driver as a module, choose M here: the
          module will be called aiptek.
@@ -47,8 +49,20 @@ config TABLET_USB_GTCO
           To compile this driver as a module, choose M here: the
           module will be called gtco.
 
+config TABLET_USB_HANWANG
+       tristate "Hanwang Art Master III tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
+       select USB
+       help
+         Say Y here if you want to use the USB version of the Hanwang Art
+         Master III tablet.
+
+         To compile this driver as a module, choose M here: the
+         module will be called hanwang.
+
 config TABLET_USB_KBTAB
        tristate "KB Gear JamStudio tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the USB version of the KB Gear
@@ -61,6 +75,7 @@ config TABLET_USB_KBTAB
 
 config TABLET_USB_WACOM
        tristate "Wacom Intuos/Graphire tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the USB version of the Wacom Intuos