diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:29:35 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:29:35 +0200 |
| commit | 35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd (patch) | |
| tree | 1f85aa8bd902aae76beb1c9deb20557a2e71fe9c /drivers/hid/Makefile | |
| parent | 9929ffed889b4861b52ba648a44fa4add945c4d1 (diff) | |
| parent | 7d3d42a79519df4cd62c3aa5d9ae2d77ebbf8fab (diff) | |
| download | kernel_samsung_aries-35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd.zip kernel_samsung_aries-35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd.tar.gz kernel_samsung_aries-35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd.tar.bz2 | |
Merge branch 'acrux' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/Makefile')
| -rw-r--r-- | drivers/hid/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 2ec042f..46f037f 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -24,6 +24,7 @@ endif obj-$(CONFIG_HID_3M_PCT) += hid-3m-pct.o obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o +obj-$(CONFIG_HID_ACRUX_FF) += hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o obj-$(CONFIG_HID_BELKIN) += hid-belkin.o obj-$(CONFIG_HID_CANDO) += hid-cando.o |