aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 16:43:46 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 16:43:46 -0400
commit0d07a15bdb5a4ea6271b6e874d307c48151ef546 (patch)
treecd91d121f71fea110a87cfcc694fc2b312e912bf /include/linux/Kbuild
parent62429f434091586d54b37b8dd46076e7c08b27b9 (diff)
parentefa0f16b0d0e87ffbef311785fed0815b0240f46 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: Suppress hidinput for Samsung IR control HID: remove 60x GTCO devices from blacklist HID: export headers properly HID: WiseGroup 866 Dual Joypad needs output reports quirk HID: ThrustMaster FF driver is no longer experimental HID: Logitech diNovo Mini pad support HID: fix race between open() and disconnect() in usbhid HID: make hid_input_field and usbhid_modify_dquirk static HID: pass numbered reports properly to hidraw HID: fix misplaced rdesc quirk HID: force feedback driver for Logitech Rumblepad 2 HID: move wait from hid to usbhid HID: make function from dbg_hid HID: fix sparse warnings HID: only dump report traffic with debug level 2 HID: patch to add NOGET for DMI/Acomdata HID: Sunplus Wireless Desktop needs report descriptor fixup HID: quirk for MS Wireless Desktop Receiver (model 1028) HID: fixup fullspeed interval on highspeed Afatech DVB-T IR kbd HID: fix build failure in hiddev_ioctl with gcc 3.2
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 34624835d90f..97a88b2b0c8e 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -211,7 +211,9 @@ unifdef-y += hdlcdrv.h
211unifdef-y += hdlc.h 211unifdef-y += hdlc.h
212unifdef-y += hdreg.h 212unifdef-y += hdreg.h
213unifdef-y += hdsmart.h 213unifdef-y += hdsmart.h
214unifdef-y += hid.h
214unifdef-y += hiddev.h 215unifdef-y += hiddev.h
216unifdef-y += hidraw.h
215unifdef-y += hpet.h 217unifdef-y += hpet.h
216unifdef-y += i2c.h 218unifdef-y += i2c.h
217unifdef-y += i2c-dev.h 219unifdef-y += i2c-dev.h