diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-02-25 17:39:16 +0100 |
| commit | 14ef2b0c026558d37662e5e095d59c64597d5769 (patch) | |
| tree | 230c09cc65bc94384c687fed87e6ada954f80609 /drivers/hid/Makefile | |
| parent | 57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff) | |
| parent | 71b38bd4c1cc4f2b653064357e4efab77dfd711d (diff) | |
| download | linux-14ef2b0c026558d37662e5e095d59c64597d5769.tar.bz2 | |
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' 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 03051694d546..0b2618f092ca 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_HID_GYRATION) += hid-gyration.o obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o obj-$(CONFIG_HID_KYE) += hid-kye.o obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o +obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o obj-$(CONFIG_HID_MOSART) += hid-mosart.o |