diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 12:39:18 +0200 |
commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /arch/arm/mach-rpc/riscpc.c | |
parent | xen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long (diff) | |
parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz linux-170465ee7f5a9a2d0ac71285507e52642e040353.zip |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/arm/mach-rpc/riscpc.c')
-rw-r--r-- | arch/arm/mach-rpc/riscpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index eca558c6bf5d..ce8470fea887 100644 --- a/arch/arm/mach-rpc/riscpc.c +++ b/arch/arm/mach-rpc/riscpc.c @@ -22,7 +22,7 @@ #include <asm/elf.h> #include <asm/io.h> #include <asm/mach-types.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/page.h> #include <asm/domain.h> #include <asm/setup.h> |