diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /include/uapi/linux/Kbuild | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'include/uapi/linux/Kbuild')
| -rw-r--r-- | include/uapi/linux/Kbuild | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 115add2515aa..33d2b8fe166d 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild | |||
| @@ -241,6 +241,8 @@ header-y += media.h | |||
| 241 | header-y += mei.h | 241 | header-y += mei.h |
| 242 | header-y += mempolicy.h | 242 | header-y += mempolicy.h |
| 243 | header-y += meye.h | 243 | header-y += meye.h |
| 244 | header-y += mic_common.h | ||
| 245 | header-y += mic_ioctl.h | ||
| 244 | header-y += mii.h | 246 | header-y += mii.h |
| 245 | header-y += minix_fs.h | 247 | header-y += minix_fs.h |
| 246 | header-y += mman.h | 248 | header-y += mman.h |