diff options
author | James Morris <james.l.morris@oracle.com> | 2012-08-17 20:42:30 +1000 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2012-08-17 20:42:30 +1000 |
commit | 51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245 (patch) | |
tree | f8b8f601713a3ecb264eb9f145636343d9350520 /arch/tile/include/asm/Kbuild | |
parent | 9f99798ff49e73dded73a8c674044ea6fb6af651 (diff) | |
parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
download | linux-51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245.tar.gz |
Merge tag 'v3.6-rc2' into next
Linux 3.6-rc2
Resync with Linus.
Diffstat (limited to 'arch/tile/include/asm/Kbuild')
-rw-r--r-- | arch/tile/include/asm/Kbuild | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 143473e3a0b..5bd71994452 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -9,7 +9,6 @@ header-y += hardwall.h generic-y += bug.h generic-y += bugs.h generic-y += cputime.h -generic-y += device.h generic-y += div64.h generic-y += emergency-restart.h generic-y += errno.h @@ -17,7 +16,6 @@ generic-y += fb.h generic-y += fcntl.h generic-y += ioctl.h generic-y += ioctls.h -generic-y += ipc.h generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h |