aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/Kbuild
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-08-16 00:32:24 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-08-16 00:32:24 -0400
commitbbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch)
tree071fa9f86dc04a16570be367d04cff3b00c694ad /arch/sh/include/asm/Kbuild
parent57682827b9a5edb52e33af0be9082b51bffcd5c7 (diff)
parentda5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sh/include/asm/Kbuild drivers/Makefile Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/Kbuild')
-rw-r--r--arch/sh/include/asm/Kbuild13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild
index b4d3462f1dc3..7beb42322f60 100644
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@ -3,10 +3,9 @@ include include/asm-generic/Kbuild.asm
3header-y += cachectl.h 3header-y += cachectl.h
4header-y += cpu-features.h 4header-y += cpu-features.h
5header-y += hw_breakpoint.h 5header-y += hw_breakpoint.h
6 6header-y += posix_types_32.h
7unifdef-y += unistd_32.h 7header-y += posix_types_64.h
8unifdef-y += unistd_64.h 8header-y += ptrace_32.h
9unifdef-y += posix_types_32.h 9header-y += ptrace_64.h
10unifdef-y += posix_types_64.h 10header-y += unistd_32.h
11unifdef-y += ptrace_32.h 11header-y += unistd_64.h
12unifdef-y += ptrace_64.h