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 */