[Xbox-linux-cvs] kernel-2.6/drivers/usb/input Makefile, 1.15, 1.16 Kconfig, 1.18, 1.19

[Laurence L. <la...@us...>]

Update of /cvsroot/xbox-linux/kernel-2.6/drivers/usb/input
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5988/drivers/usb/input

Modified Files:
	Makefile Kconfig 
Log Message:
Merge 2.6.21

Index: Makefile
===================================================================
RCS file: /cvsroot/xbox-linux/kernel-2.6/drivers/usb/input/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	11 Jun 2007 05:08:52 -0000	1.15
+++ Makefile	11 Jun 2007 05:10:00 -0000	1.16
@@ -17,6 +17,9 @@
 ifeq ($(CONFIG_LOGITECH_FF),y)
 	usbhid-objs	+= hid-lgff.o
 endif
+ifeq ($(CONFIG_PANTHERLORD_FF),y)
+	usbhid-objs	+= hid-plff.o
+endif
 ifeq ($(CONFIG_THRUSTMASTER_FF),y)
 	usbhid-objs	+= hid-tmff.o
 endif
@@ -45,6 +48,7 @@
 obj-$(CONFIG_USB_YEALINK)	+= yealink.o
 obj-$(CONFIG_USB_XPAD)		+= xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)	+= appletouch.o
+obj-$(CONFIG_USB_GTCO)         += gtco.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG

Index: Kconfig
===================================================================
RCS file: /cvsroot/xbox-linux/kernel-2.6/drivers/usb/input/Kconfig,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Kconfig	11 Jun 2007 05:08:52 -0000	1.18
+++ Kconfig	11 Jun 2007 05:10:00 -0000	1.19
@@ -58,17 +58,29 @@
 	  devices.
 
 config LOGITECH_FF
-	bool "Logitech WingMan *3D support"
+	bool "Logitech devices support"
 	depends on HID_FF
 	select INPUT_FF_MEMLESS if USB_HID
 	help
 	  Say Y here if you have one of these devices:
 	  - Logitech WingMan Cordless RumblePad
+	  - Logitech WingMan Cordless RumblePad 2
 	  - Logitech WingMan Force 3D
+	  - Logitech Formula Force EX
+	  - Logitech MOMO Force wheel
+
 	  and if you want to enable force feedback for them.
 	  Note: if you say N here, this device will still be supported, but without
 	  force feedback.
 
+config PANTHERLORD_FF
+	bool "PantherLord USB/PS2 2in1 Adapter support"
+	depends on HID_FF
+	select INPUT_FF_MEMLESS if USB_HID
+	help
+	  Say Y here if you have a PantherLord USB/PS2 2in1 Adapter and want
+	  to enable force feedback support for it.
+
 config THRUSTMASTER_FF
 	bool "ThrustMaster FireStorm Dual Power 2 support (EXPERIMENTAL)"
 	depends on HID_FF && EXPERIMENTAL
@@ -344,3 +356,15 @@
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called appletouch.
+
+config USB_GTCO
+        tristate "GTCO CalComp/InterWrite USB Support"
+        depends on USB && INPUT
+        ---help---
+          Say Y here if you want to use the USB version of the GTCO
+          CalComp/InterWrite 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 gtco.