diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-29 10:37:23 -0700 |
| commit | 590e935df0c94b2d7a4584bb26906666176a6133 (patch) | |
| tree | bb004c31d277423c7eb0f6bd2c0c1e9d8428e9f2 /include/uapi/linux/Kbuild | |
| parent | 774b195c03ac44c0dbc4e81a3f194779692ce3bd (diff) | |
| parent | 91760bceff1f3f5860ff49c14194567f972352e6 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-18.03-rtlsk-v3.18-18.02-rtlsk-v3.18-17.11-rtlsk-v3.18-17.09-rtlsk-v3.18-17.08-rtlsk-v3.18-17.05-rtlsk-v3.18-17.03-rtlsk-v3.18-16.07-rtlsk-v3.18-16.06-rtlsk-v3.18-16.05-rtlsk-v3.18-16.04-rtlsk-v3.18-16.03-rtlsk-v3.18-16.02-rtlsk-v3.18-16.01-rtlsk-v3.18-15.12-rtlsk-v3.18-15.11-rtlsk-v3.18-15.10-rtlsk-v3.18-15.09-rtlsk-v3.18-15.08-rtlsk-v3.18-15.07-rtlinux-linaro-lsk-v3.18-rt
Diffstat (limited to 'include/uapi/linux/Kbuild')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index 8523f9bb72f2..fe4739531168 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -383,6 +383,7 @@ header-y += tcp.h header-y += tcp_metrics.h header-y += telephony.h header-y += termios.h +header-y += thermal.h header-y += time.h header-y += times.h header-y += timex.h |