diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-19 11:01:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-19 11:01:25 -0400 |
| commit | f1f652447694f92beff8a534d94b36ea441c939a (patch) | |
| tree | 177f029e418d517e39dfa2495a9a67a45381b833 /arch/arm/mach-sa1100/leds-hackkit.c | |
| parent | 55babd8f41f122f5f4c7cebf520c766c983282c6 (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
Merge tag 'v3.6-rc6' into x86/mce
Merge Linux v3.6-rc6, to refresh this tree.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-sa1100/leds-hackkit.c')
| -rw-r--r-- | arch/arm/mach-sa1100/leds-hackkit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/leds-hackkit.c b/arch/arm/mach-sa1100/leds-hackkit.c index 6a2352436e62..f8e47235babe 100644 --- a/arch/arm/mach-sa1100/leds-hackkit.c +++ b/arch/arm/mach-sa1100/leds-hackkit.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * as cpu led, the green one is used as timer led. | 10 | * as cpu led, the green one is used as timer led. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/io.h> | ||
| 13 | 14 | ||
| 14 | #include <mach/hardware.h> | 15 | #include <mach/hardware.h> |
| 15 | #include <asm/leds.h> | 16 | #include <asm/leds.h> |