From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 20 Mar 2012 12:18:05 +0000 (+0100)
Subject: Merge branch 'upstream' into for-linus
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4a247a4119ee932e06e985e0a95a13c3eed4715b;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/Makefile
---

4a247a4119ee932e06e985e0a95a13c3eed4715b
diff --cc drivers/hid/Kconfig
index 3890ac698061,3d14e4f6bac1..a3d033252995
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -478,13 -481,69 +483,22 @@@ config HID_PRIMA
  	HID standard.
  
  config HID_ROCCAT
 -	tristate "Roccat special event support"
 +	tristate "Roccat device support"
  	depends on USB_HID
 -	select HID_ROCCAT_COMMON
  	---help---
 -	Support for Roccat special events.
 -	Say Y here if you have a Roccat mouse or keyboard and want OSD or
 -	macro execution support.
 -
 -config HID_ROCCAT_COMMON
 -	tristate
 -	depends on HID_ROCCAT
 -
 -config HID_ROCCAT_ARVO
 -	tristate "Roccat Arvo keyboard support"
 -	depends on USB_HID
 -	depends on HID_ROCCAT
 -	---help---
 -	Support for Roccat Arvo keyboard.
 -
 -config HID_ROCCAT_ISKU
 -	tristate "Roccat Isku keyboard support"
 -	depends on USB_HID
 -	depends on HID_ROCCAT
 -	---help---
 -	Support for Roccat Isku keyboard.
 -
 -config HID_ROCCAT_KONE
 -	tristate "Roccat Kone Mouse support"
 -	depends on USB_HID
 -	depends on HID_ROCCAT
 -	---help---
 -	Support for Roccat Kone mouse.
 -
 -config HID_ROCCAT_KONEPLUS
 -	tristate "Roccat Kone[+] mouse support"
 -	depends on USB_HID
 -	depends on HID_ROCCAT
 -	---help---
 -	Support for Roccat Kone[+] mouse.
 -
 -config HID_ROCCAT_KOVAPLUS
 -	tristate "Roccat Kova[+] mouse support"
 -	depends on USB_HID
 -	depends on HID_ROCCAT
 -	---help---
 -	Support for Roccat Kova[+] mouse.
 -
 -config HID_ROCCAT_PYRA
 -	tristate "Roccat Pyra mouse support"
 -	depends on USB_HID
 -	depends on HID_ROCCAT
 -	---help---
 -	Support for Roccat Pyra mouse.
 +	Support for Roccat devices.
 +	Say Y here if you have a Roccat mouse or keyboard and want
 +	support for its special functionalities.
  
+ config HID_SAITEK
+ 	tristate "Saitek non-fully HID-compliant devices"
+ 	depends on USB_HID
+ 	---help---
+ 	Support for Saitek devices that are not fully compliant with the
+ 	HID standard.
+ 
+ 	Currently only supports the PS1000 controller.
+ 
  config HID_SAMSUNG
  	tristate "Samsung InfraRed remote control or keyboards"
  	depends on USB_HID
diff --cc drivers/hid/Makefile
index 7d926719e21b,524532b49eaa..22f1d16cd79c
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@@ -64,9 -64,15 +64,10 @@@ obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl
  obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o
  obj-$(CONFIG_HID_PICOLCD)	+= hid-picolcd.o
  obj-$(CONFIG_HID_PRIMAX)	+= hid-primax.o
 -obj-$(CONFIG_HID_ROCCAT)	+= hid-roccat.o
 -obj-$(CONFIG_HID_ROCCAT_COMMON)	+= hid-roccat-common.o
 -obj-$(CONFIG_HID_ROCCAT_ARVO)	+= hid-roccat-arvo.o
 -obj-$(CONFIG_HID_ROCCAT_ISKU)	+= hid-roccat-isku.o
 -obj-$(CONFIG_HID_ROCCAT_KONE)	+= hid-roccat-kone.o
 -obj-$(CONFIG_HID_ROCCAT_KONEPLUS)	+= hid-roccat-koneplus.o
 -obj-$(CONFIG_HID_ROCCAT_KOVAPLUS)	+= hid-roccat-kovaplus.o
 -obj-$(CONFIG_HID_ROCCAT_PYRA)	+= hid-roccat-pyra.o
 +obj-$(CONFIG_HID_ROCCAT)	+= hid-roccat.o hid-roccat-common.o \
 +	hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
 +	hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o
+ obj-$(CONFIG_HID_SAITEK)	+= hid-saitek.o
  obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o
  obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o
  obj-$(CONFIG_HID_SONY)		+= hid-sony.o