diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 15:54:49 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 15:54:49 (GMT) |
commit | d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 (patch) | |
tree | 2fac3ffbfffc7560eeef8364b541d0d7a0057920 /include/linux/usb/Kbuild | |
parent | c7e78cff6b7518212247fb20b1dc6411540dc9af (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
download | linux-fsl-qoriq-d1a76187a5be4f89c6cb19d800cb5fb7aac735c5.tar.xz |
Merge commit 'v2.6.28-rc2' into core/locking
Conflicts:
arch/um/include/asm/system.h
Diffstat (limited to 'include/linux/usb/Kbuild')
-rw-r--r-- | include/linux/usb/Kbuild | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/Kbuild b/include/linux/usb/Kbuild index 42e84fc..54c4463 100644 --- a/include/linux/usb/Kbuild +++ b/include/linux/usb/Kbuild @@ -4,4 +4,5 @@ header-y += ch9.h header-y += gadgetfs.h header-y += midi.h header-y += g_printer.h - +header-y += tmc.h +header-y += vstusb.h |