diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:19:48 +0100 |
commit | 818fa7f3908c7bd6c0045e9d94dc23a899ef6144 (patch) | |
tree | ad3435c3f57c8222ad61709b716168932f13be6c /arch/arm/mach-iop32x/include/mach/system.h | |
parent | tracing/kmemtrace: export kmemtrace_mark_alloc_node() / kmemtrace_mark_free() (diff) | |
parent | Merge branch 'linus' into tracing/kmemtrace (diff) | |
download | linux-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.tar.xz linux-dev-818fa7f3908c7bd6c0045e9d94dc23a899ef6144.zip |
Merge branch 'tracing/kmemtrace' into tracing/kmemtrace2
Diffstat (limited to 'arch/arm/mach-iop32x/include/mach/system.h')
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/system.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/system.h b/arch/arm/mach-iop32x/include/mach/system.h index 20f923e54f46..32d9e5b0a28d 100644 --- a/arch/arm/mach-iop32x/include/mach/system.h +++ b/arch/arm/mach-iop32x/include/mach/system.h @@ -7,8 +7,9 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include <asm/mach-types.h> +#include <asm/hardware/iop3xx.h> +#include <mach/n2100.h> static inline void arch_idle(void) { |