diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-08-08 16:10:12 -0400 |
| commit | af7a535688a758d15f06a98833e6a143b29af9de (patch) | |
| tree | bac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/arm/mach-netx/nxeb500hmi.c | |
| parent | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (diff) | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/arm/mach-netx/nxeb500hmi.c')
| -rw-r--r-- | arch/arm/mach-netx/nxeb500hmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c index 53e10a9849f9..1061c01ff679 100644 --- a/arch/arm/mach-netx/nxeb500hmi.c +++ b/arch/arm/mach-netx/nxeb500hmi.c | |||
| @@ -25,11 +25,11 @@ | |||
| 25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
| 26 | #include <linux/amba/clcd.h> | 26 | #include <linux/amba/clcd.h> |
| 27 | 27 | ||
| 28 | #include <asm/hardware.h> | 28 | #include <mach/hardware.h> |
| 29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
| 30 | #include <asm/mach/arch.h> | 30 | #include <asm/mach/arch.h> |
| 31 | #include <asm/arch/netx-regs.h> | 31 | #include <mach/netx-regs.h> |
| 32 | #include <asm/arch/eth.h> | 32 | #include <mach/eth.h> |
| 33 | 33 | ||
| 34 | #include "generic.h" | 34 | #include "generic.h" |
| 35 | #include "fb.h" | 35 | #include "fb.h" |