diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:32:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 15:32:21 +0800 |
| commit | fa6e6c7406806f9d4119703e4c3ad661c25b99ee (patch) | |
| tree | 7b9c905e1befea12b5c04190d1aa3c89b3dfdd84 /include/uapi/linux | |
| parent | 582ee3a96f6a108f589bdc4ce8cc8176c8d763e5 (diff) | |
| parent | 258181e60ef13001b0ae05cb58079fd79ed86a46 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts solution:
keep 'KBUILD_CFLAGS += -fno-pic'
in arch/arm64/Makefile
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index c2e5d6cb34e3..ebd10e624598 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -307,7 +307,7 @@ header-y += nfs_mount.h header-y += nl80211.h header-y += n_r3964.h header-y += nubus.h -header-y += nvme.h +header-y += nvme_ioctl.h header-y += nvram.h header-y += omap3isp.h header-y += omapfb.h |