From ce4f6dee20ee3b462bb60566de42f8fb0cdada81 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 25 May 2010 18:20:14 +0100 Subject: [PATCH] --- yaml --- r: 201509 b: refs/heads/master c: 9e1d9345ffaa4e07c326cdb86f50d58bfabe093d h: refs/heads/master i: 201507: 8ed70cc89d7cf65b1545698e2f7f2985729b100d v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-kirkwood/ts41x-setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4a2ef635dbc5..3efe7f3464ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9afdd376b297092fa58254309b9c3cb9dfac698 +refs/heads/master: 9e1d9345ffaa4e07c326cdb86f50d58bfabe093d diff --git a/trunk/arch/arm/mach-kirkwood/ts41x-setup.c b/trunk/arch/arm/mach-kirkwood/ts41x-setup.c index df8a7e06b846..821da944b716 100644 --- a/trunk/arch/arm/mach-kirkwood/ts41x-setup.c +++ b/trunk/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 */