diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 15:25:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 15:25:44 -0700 |
| commit | 5fba0925fd6b67d94181055b7222e3d934b4efee (patch) | |
| tree | 167c0e259ec94f426674d3f79563c3e556cda845 /drivers/hid/hid-cherry.c | |
| parent | 811158b147a503fbdf9773224004ffd32002d1fe (diff) | |
| parent | 621de593081524da2f0f7b060f5951b4155eb4a2 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: remove compat stuff
HID: constify arrays of struct apple_key_translation
HID: add support for Kye/Genius Ergo 525V
HID: Support Apple mini aluminum keyboard
HID: support for Kensington slimblade device
HID: DragonRise game controller force feedback driver
HID: add support for another version of 0e8f:0003 device in hid-pl
HID: fix race between usb_register_dev() and hiddev_open()
HID: bring back possibility to specify vid/pid ignore on module load
HID: make HID_DEBUG defaults consistent
HID: autosuspend -- fix lockup of hid on reset
HID: hid_reset_resume() needs to be defined only when CONFIG_PM is set
HID: fix USB HID devices after STD with autosuspend
HID: do not try to compile PM code with CONFIG_PM unset
HID: autosuspend support for USB HID
Diffstat (limited to 'drivers/hid/hid-cherry.c')
| -rw-r--r-- | drivers/hid/hid-cherry.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/hid/hid-cherry.c b/drivers/hid/hid-cherry.c index b833b9769ab..ab8209e7e45 100644 --- a/drivers/hid/hid-cherry.c +++ b/drivers/hid/hid-cherry.c @@ -83,5 +83,3 @@ static void ch_exit(void) module_init(ch_init); module_exit(ch_exit); MODULE_LICENSE("GPL"); - -HID_COMPAT_LOAD_DRIVER(cherry); |