Subject: [wrecked] h8300-kernel-timer-timer8c-add-missing-semicolon.patch removed from -mm tree
To: gang.chen@xxxxxxxxxxx,geert@xxxxxxxxxxxxxx,ysato@xxxxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 13 Sep 2013 12:37:45 -0700
The patch titled
Subject: h8300/kernel/timer/timer8.c: add missing semicolon
has been removed from the -mm tree. Its filename was
h8300-kernel-timer-timer8c-add-missing-semicolon.patch
This patch was dropped because other changes were merged, which wrecked this patch
------------------------------------------------------
From: Chen Gang <gang.chen@xxxxxxxxxxx>
Subject: h8300/kernel/timer/timer8.c: add missing semicolon
arch/h8300/kernel/timer/timer8.c: In function 'h8300_timer_setup':
arch/h8300/kernel/timer/timer8.c:98:2: error: expected ';' before 'ctrl_outw'
Signed-off-by: Chen Gang <gang.chen@xxxxxxxxxxx>
Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/h8300/kernel/timer/timer8.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/h8300/kernel/timer/timer8.c~h8300-kernel-timer-timer8c-add-missing-semicolon arch/h8300/kernel/timer/timer8.c
--- a/arch/h8300/kernel/timer/timer8.c~h8300-kernel-timer-timer8c-add-missing-semicolon
+++ a/arch/h8300/kernel/timer/timer8.c
@@ -91,7 +91,7 @@ void __init h8300_timer_setup(void)
#if defined(CONFIG_CPU_H8S)
/* Timer module enable */
- ctrl_bclr(0, MSTPCRL)
+ ctrl_bclr(0, MSTPCRL);
#endif
/* initialize timer */
_
Patches currently in -mm which might be from gang.chen@xxxxxxxxxxx are
origin.patch
sh64-kernel-use-usp-instead-of-fn.patch
sh64-kernel-remove-useless-variable-regs.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
