diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 22:16:17 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 22:16:17 +0400 |
commit | 231bf80f7f14107f7ecfa2e0a2b0c56e6a793284 (patch) | |
tree | 268a7dc003f1a36554f784086cb59f211119e0c1 /arch/arm/mach-shmobile/board-armadillo800eva-reference.c | |
parent | b3345d7c57d70e6cb6749af25cdbe80515582e99 (diff) | |
parent | bdd18e8f76e33151a850906c8353222bd06a49e6 (diff) | |
download | linux-231bf80f7f14107f7ecfa2e0a2b0c56e6a793284.tar.xz |
Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC board changes from Olof Johansson:
"This is the smallest board branch we have ever had. Most of this is a
few cleanups for board code for Renesas shmobile, with a bit of legacy
driver support added. This is strongly trending in the right
direction now"
* tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: shmobile: Enable R-Car Gen2 CMA code in board files
ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
ARM: shmobile: armadillo800eva legacy: Add LED support
ARM: shmobile: lager-reference: Remove workarounds for core clock issues
ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva-reference.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c index 208576667b22..84bc6cb6d5aa 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c @@ -55,11 +55,11 @@ * CON22 Serial * CON23 LAN * CON24 USB3 - * LED1 Camera LED(Yellow) + * LED1 Camera LED (Yellow) * LED2 Power LED (Green) - * ED3-LED6 User LED(Yellow) - * LED7 LAN link LED(Green) - * LED8 LAN activity LED(Yellow) + * LED3-LED6 User LED (Yellow) + * LED7 LAN link LED (Green) + * LED8 LAN activity LED (Yellow) */ /* |