summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2010-05-25 18:20:14 +0100
committerNicolas Pitre <nico@fluxnic.net>2010-07-16 22:01:26 -0400
commit9e1d9345ffaa4e07c326cdb86f50d58bfabe093d (patch)
tree14e246f789390d071f395fa76e81ba3717a8b79b /arch/arm/mach-kirkwood
parentf9afdd376b297092fa58254309b9c3cb9dfac698 (diff)
downloadblackbird-op-linux-9e1d9345ffaa4e07c326cdb86f50d58bfabe093d.tar.gz
blackbird-op-linux-9e1d9345ffaa4e07c326cdb86f50d58bfabe093d.zip
[ARM] Kirkwood: Fix explanation of MPP45 for QNAP TS41x
On the QNAP TS-41x, MPP45 is used to show the setting of jumper JP1. Fix the documentation to explain what the settings really indicate. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r--arch/arm/mach-kirkwood/ts41x-setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
index df8a7e06b846..821da944b716 100644
--- a/arch/arm/mach-kirkwood/ts41x-setup.c
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c
@@ -105,7 +105,7 @@ static unsigned int qnap_ts41x_mpp_config[] __initdata = {
MPP37_GPIO, /* Reset button */
MPP43_GPIO, /* USB Copy button */
MPP44_GPIO, /* Board ID: 0: TS-419U, 1: TS-419 */
- MPP45_GPIO, /* JP1: 0: console, 1: LCD */
+ MPP45_GPIO, /* JP1: 0: LCD, 1: serial console */
MPP46_GPIO, /* External SATA HDD1 error indicator */
MPP47_GPIO, /* External SATA HDD2 error indicator */
MPP48_GPIO, /* External SATA HDD3 error indicator */
OpenPOWER on IntegriCloud