diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-07-24 15:40:06 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-07-24 15:40:06 +0400 |
| commit | c062c4d1de57789bf15f7641a24c429eeb8a1c6a (patch) | |
| tree | dfd376034ea8458689c937dafa5e318892af82af /drivers/hid/Makefile | |
| parent | 929bd380b7aec9f9553b6509af86cdba25e334b8 (diff) | |
| parent | adefb69b1b94df29ea2df05cd838c0e032b2c473 (diff) | |
| download | linux-c062c4d1de57789bf15f7641a24c429eeb8a1c6a.tar.xz | |
Merge branch 'uhid' into for-linus
Conflicts:
drivers/hid/Kconfig
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 02fa93896951..f975485f88b2 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -8,6 +8,7 @@ ifdef CONFIG_DEBUG_FS endif obj-$(CONFIG_HID) += hid.o +obj-$(CONFIG_UHID) += uhid.o obj-$(CONFIG_HID_GENERIC) += hid-generic.o |