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-sa1100/leds-simpad.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-sa1100/leds-simpad.c')
| -rw-r--r-- | arch/arm/mach-sa1100/leds-simpad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/leds-simpad.c b/arch/arm/mach-sa1100/leds-simpad.c index def090a87385..d50f4eeaa12e 100644 --- a/arch/arm/mach-sa1100/leds-simpad.c +++ b/arch/arm/mach-sa1100/leds-simpad.c | |||
| @@ -5,10 +5,10 @@ | |||
| 5 | */ | 5 | */ |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | 7 | ||
| 8 | #include <asm/hardware.h> | 8 | #include <mach/hardware.h> |
| 9 | #include <asm/leds.h> | 9 | #include <asm/leds.h> |
| 10 | #include <asm/system.h> | 10 | #include <asm/system.h> |
| 11 | #include <asm/arch/simpad.h> | 11 | #include <mach/simpad.h> |
| 12 | 12 | ||
| 13 | #include "leds.h" | 13 | #include "leds.h" |
| 14 | 14 | ||