diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-02 10:21:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-02 10:21:26 +0200 |
| commit | d6d5aeb661fc14655c417f3582ae7ec52985d2a8 (patch) | |
| tree | 5e168da05cb28d10b5accc74718428cfd5527201 /arch/arm/mach-rpc/dma.c | |
| parent | 7e6e178ab1548c8d894a77593e757acf4510b8ba (diff) | |
| parent | 94aca1dac6f6d21f4b07e4864baf7768cabcc6e7 (diff) | |
Merge commit 'v2.6.27-rc8' into genirq
Diffstat (limited to 'arch/arm/mach-rpc/dma.c')
| -rw-r--r-- | arch/arm/mach-rpc/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c index 596379a4cf8..4b19fe48419 100644 --- a/arch/arm/mach-rpc/dma.c +++ b/arch/arm/mach-rpc/dma.c @@ -20,7 +20,7 @@ #include <asm/fiq.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/uaccess.h> #include <asm/mach/dma.h> |