diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 16:12:12 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 16:12:12 +0100 |
commit | 158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch) | |
tree | 2e6d808fef46d70268e547ccfc5926a865e3d2ea /arch/arm/mach-at91 | |
parent | 641e79129a56a4c50be1aed0fa713f440b46a440 (diff) | |
parent | 25f4a81ef51b7c279786f5b81fe6d89510f46d99 (diff) | |
download | blackbird-op-linux-158304ef09a28c7f2dd37d78f536a4e09ba084a1.tar.gz blackbird-op-linux-158304ef09a28c7f2dd37d78f536a4e09ba084a1.zip |
Merge branch 'fixes' into devel
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r-- | arch/arm/mach-at91/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9261ek.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 56b0d06c764b..a4d80eb056ee 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o # LEDs support led-$(CONFIG_ARCH_AT91RM9200DK) += leds.o led-$(CONFIG_MACH_AT91RM9200EK) += leds.o +led-$(CONFIG_MACH_AT91SAM9261EK)+= leds.o led-$(CONFIG_MACH_CSB337) += leds.o led-$(CONFIG_MACH_CSB637) += leds.o led-$(CONFIG_MACH_KB9200) += leds.o diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c index bcf71536cc6d..1f0c8a400b3a 100644 --- a/arch/arm/mach-at91/board-sam9261ek.c +++ b/arch/arm/mach-at91/board-sam9261ek.c @@ -60,6 +60,9 @@ static void __init ek_map_io(void) /* Initialize processor: 18.432 MHz crystal */ at91sam9261_initialize(18432000); + /* Setup the LEDs */ + at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14); + /* Setup the serial ports and console */ at91_init_serial(&ek_uart_config); } |