diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 15:46:58 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-17 15:48:06 -0400 |
| commit | 2dd22997679a88874c131f6e6ffb963e6d43b3a6 (patch) | |
| tree | bfe1707dda7e755b8b550c6796e2649813bcfbb9 /include/linux/usb/Kbuild | |
| parent | 36885ff0e6563687e6152da6d311abbf83c0198f (diff) | |
| parent | 7b7adc4a016a1decb806eb71ecab98721fa7f146 (diff) | |
Merge remote-tracking branch 'origin' into spi/next
Pull in Linus' tree to pick up changes required for the langwell gpio fixes
Diffstat (limited to 'include/linux/usb/Kbuild')
| -rw-r--r-- | include/linux/usb/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/Kbuild b/include/linux/usb/Kbuild index 51410e0200cf..ed91fb62674b 100644 --- a/include/linux/usb/Kbuild +++ b/include/linux/usb/Kbuild | |||
| @@ -2,6 +2,7 @@ header-y += audio.h | |||
| 2 | header-y += cdc.h | 2 | header-y += cdc.h |
| 3 | header-y += ch9.h | 3 | header-y += ch9.h |
| 4 | header-y += ch11.h | 4 | header-y += ch11.h |
| 5 | header-y += functionfs.h | ||
| 5 | header-y += gadgetfs.h | 6 | header-y += gadgetfs.h |
| 6 | header-y += midi.h | 7 | header-y += midi.h |
| 7 | header-y += g_printer.h | 8 | header-y += g_printer.h |