diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 00:32:24 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 00:32:24 -0400 |
commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /arch/sh/include/asm/Kbuild | |
parent | 57682827b9a5edb52e33af0be9082b51bffcd5c7 (diff) | |
parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (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/Kbuild | 13 |
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 | |||
3 | header-y += cachectl.h | 3 | header-y += cachectl.h |
4 | header-y += cpu-features.h | 4 | header-y += cpu-features.h |
5 | header-y += hw_breakpoint.h | 5 | header-y += hw_breakpoint.h |
6 | 6 | header-y += posix_types_32.h | |
7 | unifdef-y += unistd_32.h | 7 | header-y += posix_types_64.h |
8 | unifdef-y += unistd_64.h | 8 | header-y += ptrace_32.h |
9 | unifdef-y += posix_types_32.h | 9 | header-y += ptrace_64.h |
10 | unifdef-y += posix_types_64.h | 10 | header-y += unistd_32.h |
11 | unifdef-y += ptrace_32.h | 11 | header-y += unistd_64.h |
12 | unifdef-y += ptrace_64.h | ||