diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 09:35:18 -0500 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /include/uapi/linux/Kbuild | |
| parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
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 |
