linux-stable.git/drivers/hid/Makefile, branch linux-2.6.36.y Linux kernel stable tree Merge branch 'acrux' into for-linus 2010-08-04T13:29:35+00:00 Jiri Kosina jkosina@suse.cz 2010-08-04T13:29:35+00:00 35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd Conflicts: drivers/hid/hid-ids.h 
Conflicts:
	drivers/hid/hid-ids.h
Merge branch 'upstream' into for-linus 2010-08-04T13:26:15+00:00 Jiri Kosina jkosina@suse.cz 2010-08-04T13:26:15+00:00 fc73697bd5bf4efe8b5b2b78ec09e00f967cd055 Conflicts: drivers/hid/hid-ids.h 
Conflicts:
	drivers/hid/hid-ids.h
HID: add ACRUX game controller force feedback support 2010-07-19T10:13:23+00:00 Sergei Kolzun x0r@dv-life.ru 2010-07-19T10:13:23+00:00 c0dbcc33c652a0646542560de29a1c3f1ab7169f Adds force feedback support for ACRUX USB game controllers. These devices are mass produced in China by several vendors. Signed-off-by: Sergei Kolzun <x0r@dv-life.ru> Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Jiri Kosina <jkosina@suse.cz> 
Adds force feedback support for ACRUX USB game controllers.
These devices are mass produced in China by several vendors.

Signed-off-by: Sergei Kolzun <x0r@dv-life.ru>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
HID: add proper support for Elecom BM084 bluetooth mouse 2010-06-28T17:02:47+00:00 Richard Nauber richard.nauber@googlemail.com 2010-06-28T16:54:25+00:00 64b386ea16112564e0b93473e2c347125effb6b2 This patch removes the annoying feature of Elecoms BM084 to constantly scroll to the right. The device can be found at: http://www.dealextreme.com/details.dx/sku.15402 Signed-off-by: Richard Nauber <Richard.Nauber@gmail.com> [jkosina@suse.cz: fix build error] Signed-off-by: Jiri Kosina <jkosina@suse.cz> 
This patch removes the annoying feature of Elecoms BM084 to constantly scroll to the right.
The device can be found at:
http://www.dealextreme.com/details.dx/sku.15402

Signed-off-by: Richard Nauber <Richard.Nauber@gmail.com>
[jkosina@suse.cz: fix build error]
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
HID: roccat: propagate special events of roccat hardware to userspace 2010-05-25T07:57:03+00:00 Stefan Achatz erazor_de@users.sourceforge.net 2010-05-19T16:55:16+00:00 206f5f2fcb5ff5bb0c60f9e9189937f3ca03e378 Module roccat is a char device used to report special events of roccat hardware to userland. These events include requests for on-screen-display of profile or dpi settings or requests for execution of macro sequences that are not stored in device. The information in these events depends on hid device implementation and contains data that is not available in a single hid event or else hidraw could have been used. It is inspired by hidraw, but uses only one circular buffer for all readers. The device is as generic as possible so that the functionality is usable by all (kone and upcomming) roccat device drivers. Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz> 
Module roccat is a char device used to report special events of roccat hardware
to userland. These events include requests for on-screen-display of profile or
dpi settings or requests for execution of macro sequences that are not stored
in device. The information in these events depends on hid device implementation
and contains data that is not available in a single hid event or else hidraw
could have been used.

It is inspired by hidraw, but uses only one circular buffer for all readers.
The device is as generic as possible so that the functionality is usable by all
(kone and upcomming) roccat device drivers.

Signed-off-by: Stefan Achatz <erazor_de@users.sourceforge.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus 2010-05-19T12:27:08+00:00 Jiri Kosina jkosina@suse.cz 2010-05-19T12:27:08+00:00 36dbe2fc5534291d261a4c63033232aa2f60c2a9 Conflicts: drivers/hid/Makefile 
Conflicts:
	drivers/hid/Makefile
Merge branch 'egalax' into for-linus 2010-05-19T12:26:44+00:00 Jiri Kosina jkosina@suse.cz 2010-05-19T12:26:44+00:00 77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 Conflicts: drivers/hid/hid-ids.h 
Conflicts:
	drivers/hid/hid-ids.h
Merge branch 'cando' into for-linus 2010-05-19T12:09:31+00:00 Jiri Kosina jkosina@suse.cz 2010-05-19T12:09:31+00:00 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h 
Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
HID: Zydacron Remote Control driver 2010-05-17T08:37:04+00:00 Don Prince dhprince.devel@yahoo.co.uk 2010-05-14T16:30:59+00:00 a9885c8f7bf62e251fc178f838b9f0ee897c158a A specialised HID driver for the Zydacron Remote Control (usb id: 13ec:0006). The specialised HID driver adds support for the buttons which are not currently handled by the default HID driver. Signed-off-by: Don Prince <dhprince-devel@yahoo.co.uk> Signed-off-by: Jiri Kosina <jkosina@suse.cz> 
A specialised HID driver for the Zydacron Remote Control (usb id: 13ec:0006).

The specialised HID driver adds support for the buttons which are not

currently handled by the default HID driver.

Signed-off-by: Don Prince <dhprince-devel@yahoo.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
HID: Prodikeys PC-MIDI HID Driver 2010-05-12T13:18:59+00:00 Don Prince dhprince-devel@yahoo.co.uk 2010-05-12T13:18:59+00:00 3a370ca1dcf8c80aff7a0a21d6b0f50ca2a151e9 A specialised HID driver for the Creative Prodikeys PC-MIDI USB Keyboard. The Prodikeys PC-MIDI is a multifunction keyboard comprising a qwerty keyboard, multimedia keys and a touch sensitive musical keyboard. The specialised HID driver adds full support for the musical keyboard and extra multimedia keys which are not currently handled by the default HID driver. The specialised HID driver interfaces with ALSA, and presents the midi keyboard as a rawmidi device. Sustain duration, octave shifting and the midi output channel can be read/written form userspace via sysfs. Signed-off-by: Don Prince <dhprince-devel@yahoo.co.uk> ALSA parts: Acked-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz> 
A specialised HID driver for the Creative Prodikeys PC-MIDI USB Keyboard.

The Prodikeys PC-MIDI is a multifunction keyboard comprising a qwerty keyboard,
multimedia keys and a touch sensitive musical keyboard.

The specialised HID driver adds full support for the musical keyboard and extra
multimedia keys which are not currently handled by the default HID driver.

The specialised HID driver interfaces with ALSA, and presents the midi keyboard
as a rawmidi device. Sustain duration, octave shifting and the midi output
channel can be read/written form userspace via sysfs.

Signed-off-by: Don Prince <dhprince-devel@yahoo.co.uk>
ALSA parts:
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>