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-omap1/leds-innovator.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-omap1/leds-innovator.c')
-rw-r--r-- | arch/arm/mach-omap1/leds-innovator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c index e7835d6f53a0..9b99c2894623 100644 --- a/arch/arm/mach-omap1/leds-innovator.c +++ b/arch/arm/mach-omap1/leds-innovator.c | |||
@@ -3,7 +3,7 @@ | |||
3 | */ | 3 | */ |
4 | #include <linux/init.h> | 4 | #include <linux/init.h> |
5 | 5 | ||
6 | #include <asm/hardware.h> | 6 | #include <mach/hardware.h> |
7 | #include <asm/leds.h> | 7 | #include <asm/leds.h> |
8 | #include <asm/system.h> | 8 | #include <asm/system.h> |
9 | 9 | ||