Input: move USB miscellaneous devices under drivers/input/misc

+81 -7

drivers/input/misc/Kconfig

··· 40 40 tristate "M68k Beeper support" 41 41 depends on M68K 42 42 43 + config INPUT_IXP4XX_BEEPER 44 + tristate "IXP4XX Beeper support" 45 + depends on ARCH_IXP4XX 46 + help 47 + If you say yes here, you can connect a beeper to the 48 + ixp4xx gpio pins. This is used by the LinkSys NSLU2. 49 + 50 + If unsure, say Y. 51 + 52 + To compile this driver as a module, choose M here: the 53 + module will be called ixp4xx-beeper. 54 + 43 55 config INPUT_COBALT_BTNS 44 56 tristate "Cobalt button interface" 45 57 depends on MIPS_COBALT ··· 82 70 To compile this driver as a module, choose M here: the module will 83 71 be called atlas_btns. 84 72 85 - config INPUT_IXP4XX_BEEPER 86 - tristate "IXP4XX Beeper support" 87 - depends on ARCH_IXP4XX 73 + config INPUT_ATI_REMOTE 74 + tristate "ATI / X10 USB RF remote control" 75 + select USB 88 76 help 89 - If you say yes here, you can connect a beeper to the 90 - ixp4xx gpio pins. This is used by the LinkSys NSLU2. 77 + Say Y here if you want to use an ATI or X10 "Lola" USB remote control. 78 + These are RF remotes with USB receivers. 79 + The ATI remote comes with many of ATI's All-In-Wonder video cards. 80 + The X10 "Lola" remote is available at: 81 + <http://www.x10.com/products/lola_sg1.htm> 82 + This driver provides mouse pointer, left and right mouse buttons, 83 + and maps all the other remote buttons to keypress events. 91 84 92 - If unsure, say Y. 85 + To compile this driver as a module, choose M here: the module will be 86 + called ati_remote. 87 + 88 + config INPUT_ATI_REMOTE2 89 + tristate "ATI / Philips USB RF remote control" 90 + select USB 91 + help 92 + Say Y here if you want to use an ATI or Philips USB RF remote control. 93 + These are RF remotes with USB receivers. 94 + ATI Remote Wonder II comes with some ATI's All-In-Wonder video cards 95 + and is also available as a separate product. 96 + This driver provides mouse pointer, left and right mouse buttons, 97 + and maps all the other remote buttons to keypress events. 98 + 99 + To compile this driver as a module, choose M here: the module will be 100 + called ati_remote2. 101 + 102 + config INPUT_KEYSPAN_REMOTE 103 + tristate "Keyspan DMR USB remote control (EXPERIMENTAL)" 104 + depends on EXPERIMENTAL 105 + select USB 106 + help 107 + Say Y here if you want to use a Keyspan DMR USB remote control. 108 + Currently only the UIA-11 type of receiver has been tested. The tag 109 + on the receiver that connects to the USB port should have a P/N that 110 + will tell you what type of DMR you have. The UIA-10 type is not 111 + supported at this time. This driver maps all buttons to keypress 112 + events. 113 + 114 + To compile this driver as a module, choose M here: the module will 115 + be called keyspan_remote. 116 + 117 + config INPUT_POWERMATE 118 + tristate "Griffin PowerMate and Contour Jog support" 119 + select USB 120 + help 121 + Say Y here if you want to use Griffin PowerMate or Contour Jog devices. 122 + These are aluminum dials which can measure clockwise and anticlockwise 123 + rotation. The dial also acts as a pushbutton. The base contains an LED 124 + which can be instructed to pulse or to switch to a particular intensity. 125 + 126 + You can download userspace tools from 127 + <http://sowerbutts.com/powermate/>. 93 128 94 129 To compile this driver as a module, choose M here: the 95 - module will be called ixp4xx-beeper. 130 + module will be called powermate. 131 + 132 + config INPUT_YEALINK 133 + tristate "Yealink usb-p1k voip phone" 134 + depends EXPERIMENTAL 135 + select USB 136 + help 137 + Say Y here if you want to enable keyboard and LCD functions of the 138 + Yealink usb-p1k usb phones. The audio part is enabled by the generic 139 + usb sound driver, so you might want to enable that as well. 140 + 141 + For information about how to use these additional functions, see 142 + <file:Documentation/input/yealink.txt>. 143 + 144 + To compile this driver as a module, choose M here: the module will be 145 + called yealink. 96 146 97 147 config INPUT_UINPUT 98 148 tristate "User level driver support"

+7 -2

drivers/input/misc/Makefile

··· 8 8 obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o 9 9 obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o 10 10 obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o 11 - obj-$(CONFIG_INPUT_UINPUT) += uinput.o 11 + obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o 12 12 obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o 13 13 obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o 14 14 obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o 15 + obj-$(CONFIG_INPUT_ATI_REMOTE) += ati_remote.o 16 + obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o 17 + obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o 18 + obj-$(CONFIG_INPUT_POWERMATE) += powermate.o 19 + obj-$(CONFIG_INPUT_YEALINK) += yealink.o 15 20 obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o 16 - obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o 21 + obj-$(CONFIG_INPUT_UINPUT) += uinput.o

-2

drivers/usb/Kconfig

··· 85 85 86 86 source "drivers/usb/storage/Kconfig" 87 87 88 - source "drivers/usb/input/Kconfig" 89 - 90 88 source "drivers/usb/image/Kconfig" 91 89 92 90 source "drivers/usb/net/Kconfig"

-3

drivers/usb/Makefile

··· 23 23 obj-$(CONFIG_USB_STORAGE) += storage/ 24 24 obj-$(CONFIG_USB) += storage/ 25 25 26 - obj-$(CONFIG_USB_ATI_REMOTE) += input/ 27 - obj-$(CONFIG_USB_POWERMATE) += input/ 28 - 29 26 obj-$(CONFIG_USB_CATC) += net/ 30 27 obj-$(CONFIG_USB_KAWETH) += net/ 31 28 obj-$(CONFIG_USB_PEGASUS) += net/

-77

drivers/usb/input/Kconfig

··· 1 - # 2 - # USB Input driver configuration 3 - # 4 - comment "USB Input Devices" 5 - depends on USB 6 - 7 - config USB_POWERMATE 8 - tristate "Griffin PowerMate and Contour Jog support" 9 - depends on USB && INPUT 10 - ---help--- 11 - Say Y here if you want to use Griffin PowerMate or Contour Jog devices. 12 - These are aluminum dials which can measure clockwise and anticlockwise 13 - rotation. The dial also acts as a pushbutton. The base contains an LED 14 - which can be instructed to pulse or to switch to a particular intensity. 15 - 16 - You can download userspace tools from 17 - <http://sowerbutts.com/powermate/>. 18 - 19 - To compile this driver as a module, choose M here: the 20 - module will be called powermate. 21 - 22 - config USB_YEALINK 23 - tristate "Yealink usb-p1k voip phone" 24 - depends on USB && INPUT && EXPERIMENTAL 25 - ---help--- 26 - Say Y here if you want to enable keyboard and LCD functions of the 27 - Yealink usb-p1k usb phones. The audio part is enabled by the generic 28 - usb sound driver, so you might want to enable that as well. 29 - 30 - For information about how to use these additional functions, see 31 - <file:Documentation/input/yealink.txt>. 32 - 33 - To compile this driver as a module, choose M here: the module will be 34 - called yealink. 35 - 36 - config USB_ATI_REMOTE 37 - tristate "ATI / X10 USB RF remote control" 38 - depends on USB && INPUT 39 - ---help--- 40 - Say Y here if you want to use an ATI or X10 "Lola" USB remote control. 41 - These are RF remotes with USB receivers. 42 - The ATI remote comes with many of ATI's All-In-Wonder video cards. 43 - The X10 "Lola" remote is available at: 44 - <http://www.x10.com/products/lola_sg1.htm> 45 - This driver provides mouse pointer, left and right mouse buttons, 46 - and maps all the other remote buttons to keypress events. 47 - 48 - To compile this driver as a module, choose M here: the module will be 49 - called ati_remote. 50 - 51 - config USB_ATI_REMOTE2 52 - tristate "ATI / Philips USB RF remote control" 53 - depends on USB && INPUT 54 - ---help--- 55 - Say Y here if you want to use an ATI or Philips USB RF remote control. 56 - These are RF remotes with USB receivers. 57 - ATI Remote Wonder II comes with some ATI's All-In-Wonder video cards 58 - and is also available as a separate product. 59 - This driver provides mouse pointer, left and right mouse buttons, 60 - and maps all the other remote buttons to keypress events. 61 - 62 - To compile this driver as a module, choose M here: the module will be 63 - called ati_remote2. 64 - 65 - config USB_KEYSPAN_REMOTE 66 - tristate "Keyspan DMR USB remote control (EXPERIMENTAL)" 67 - depends on USB && INPUT && EXPERIMENTAL 68 - ---help--- 69 - Say Y here if you want to use a Keyspan DMR USB remote control. 70 - Currently only the UIA-11 type of receiver has been tested. The tag 71 - on the receiver that connects to the USB port should have a P/N that 72 - will tell you what type of DMR you have. The UIA-10 type is not 73 - supported at this time. This driver maps all buttons to keypress 74 - events. 75 - 76 - To compile this driver as a module, choose M here: the module will 77 - be called keyspan_remote.

-13

drivers/usb/input/Makefile

··· 1 - # 2 - # Makefile for the USB input drivers 3 - # 4 - 5 - obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o 6 - obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o 7 - obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o 8 - obj-$(CONFIG_USB_POWERMATE) += powermate.o 9 - obj-$(CONFIG_USB_YEALINK) += yealink.o 10 - 11 - ifeq ($(CONFIG_USB_DEBUG),y) 12 - EXTRA_CFLAGS += -DDEBUG 13 - endif

drivers/usb/input/ati_remote.c drivers/input/misc/ati_remote.c

drivers/usb/input/ati_remote2.c drivers/input/misc/ati_remote2.c

drivers/usb/input/keyspan_remote.c drivers/input/misc/keyspan_remote.c

drivers/usb/input/map_to_7segment.h drivers/input/misc/map_to_7segment.h

drivers/usb/input/powermate.c drivers/input/misc/powermate.c

+1 -1

drivers/usb/input/yealink.c drivers/input/misc/yealink.c

··· 29 29 * This driver is based on: 30 30 * - the usbb2k-api http://savannah.nongnu.org/projects/usbb2k-api/ 31 31 * - information from http://memeteau.free.fr/usbb2k 32 - * - the xpad-driver drivers/usb/input/xpad.c 32 + * - the xpad-driver drivers/input/joystick/xpad.c 33 33 * 34 34 * Thanks to: 35 35 * - Olivier Vandorpe, for providing the usbb2k-api.

drivers/usb/input/yealink.h drivers/input/misc/yealink.h