diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 18:36:07 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 18:36:07 +0100 |
| commit | 6097a07411005c0184cf90256743c784079198fc (patch) | |
| tree | 0c6496aa7de5f00a60ed8e7bac4b34f5acc7e30a /arch/hexagon/include/asm/Kbuild | |
| parent | arm64: Use generic sys_execve() implementation (diff) | |
| parent | Linux 3.7-rc5 (diff) | |
| download | linux-6097a07411005c0184cf90256743c784079198fc.tar.xz linux-6097a07411005c0184cf90256743c784079198fc.zip | |
Merge tag 'v3.7-rc5' into execve
Linux 3.7-rc5
Conflicts:
arch/arm64/kernel/process.c
Diffstat (limited to 'arch/hexagon/include/asm/Kbuild')
| -rw-r--r-- | arch/hexagon/include/asm/Kbuild | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 3364b6966d26..3bfa9b30f448 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -1,8 +1,5 @@ -include include/asm-generic/Kbuild.asm -header-y += registers.h header-y += ucontext.h -header-y += user.h generic-y += auxvec.h generic-y += bug.h |