diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-09-05 18:17:42 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-05 18:17:42 +0400 |
| commit | 188ce5abebf56ec732f652abe608b94c317e4963 (patch) | |
| tree | 23bda38c221abb46b566a1aef36029eab00a50b9 /include/linux/Kbuild | |
| parent | 362b0563b28506d534a82d9c6cd5fdf58783fda6 (diff) | |
| parent | a4881cc45a3fab4488e16c4934e149cfa620f1a9 (diff) | |
| download | linux-188ce5abebf56ec732f652abe608b94c317e4963.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 8760be30b375..9547daddf813 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -183,7 +183,6 @@ header-y += if_ppp.h header-y += if_pppol2tp.h header-y += if_pppox.h header-y += if_slip.h -header-y += if_strip.h header-y += if_team.h header-y += if_tun.h header-y += if_tunnel.h @@ -376,6 +375,7 @@ header-y += tty.h header-y += types.h header-y += udf_fs_i.h header-y += udp.h +header-y += uhid.h header-y += uinput.h header-y += uio.h header-y += ultrasound.h |