diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 05:32:31 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 05:32:31 -0400 |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /drivers/hid/Makefile | |
| parent | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff) | |
| parent | d1257081aecf44455fcab8675f1d54e8b242faa1 (diff) | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
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 a04cffa4784f..ca6cc9f0485c 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -38,6 +38,7 @@ endif | |||
| 38 | obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o | 38 | obj-$(CONFIG_HID_A4TECH) += hid-a4tech.o |
| 39 | obj-$(CONFIG_HID_ACRUX) += hid-axff.o | 39 | obj-$(CONFIG_HID_ACRUX) += hid-axff.o |
| 40 | obj-$(CONFIG_HID_APPLE) += hid-apple.o | 40 | obj-$(CONFIG_HID_APPLE) += hid-apple.o |
| 41 | obj-$(CONFIG_HID_AUREAL) += hid-aureal.o | ||
| 41 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o | 42 | obj-$(CONFIG_HID_BELKIN) += hid-belkin.o |
| 42 | obj-$(CONFIG_HID_CHERRY) += hid-cherry.o | 43 | obj-$(CONFIG_HID_CHERRY) += hid-cherry.o |
| 43 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o | 44 | obj-$(CONFIG_HID_CHICONY) += hid-chicony.o |