git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-05-02 18:17:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'egalax' into for-linus

Browse Source 
Conflicts:
	drivers/hid/hid-ids.h
This commit is contained in:
Jiri Kosina
2010-05-19 14:26:44 +02:00
parent 896ebc0935 c872b0fccc
commit 77933c354c
6 changed files with 292 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/hid/Makefile
View File

@@ -31,6 +31,7 @@ obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o
obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o
obj-$(CONFIG_HID_EGALAX) += hid-egalax.o
obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o