diff options
| author | Olof Johansson <olof@lixom.net> | 2017-05-19 08:54:47 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-05-19 08:54:47 +0200 |
| commit | 5252d73756f318f182f2316acd78a6532041414d (patch) | |
| tree | b082478fca4f00f599bb2ed1547b2652c2bea155 /arch/m32r/include/uapi/asm/Kbuild | |
| parent | tee: add ARM_SMCCC dependency (diff) | |
| parent | Linux 4.12-rc1 (diff) | |
| download | linux-5252d73756f318f182f2316acd78a6532041414d.tar.xz linux-5252d73756f318f182f2316acd78a6532041414d.zip | |
Merge tag 'v4.12-rc1' into fixes
We've received a few fixes branches with -rc1 as base, but our contents was
still at pre-rc1. Merge it in expliticly to make 'git merge --log' clear on
hat was actually merged.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/m32r/include/uapi/asm/Kbuild')
| -rw-r--r-- | arch/m32r/include/uapi/asm/Kbuild | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/m32r/include/uapi/asm/Kbuild b/arch/m32r/include/uapi/asm/Kbuild index 43937a61d6cf..b15bf6bc0e94 100644 --- a/arch/m32r/include/uapi/asm/Kbuild +++ b/arch/m32r/include/uapi/asm/Kbuild @@ -1,33 +1,2 @@ # UAPI Header export list include include/uapi/asm-generic/Kbuild.asm - -header-y += auxvec.h -header-y += bitsperlong.h -header-y += byteorder.h -header-y += errno.h -header-y += fcntl.h -header-y += ioctl.h -header-y += ioctls.h -header-y += ipcbuf.h -header-y += mman.h -header-y += msgbuf.h -header-y += param.h -header-y += poll.h -header-y += posix_types.h -header-y += ptrace.h -header-y += resource.h -header-y += sembuf.h -header-y += setup.h -header-y += shmbuf.h -header-y += sigcontext.h -header-y += siginfo.h -header-y += signal.h -header-y += socket.h -header-y += sockios.h -header-y += stat.h -header-y += statfs.h -header-y += swab.h -header-y += termbits.h -header-y += termios.h -header-y += types.h -header-y += unistd.h |