The patch titled s3c2410_wdt: fix build breakage has been removed from the -mm tree. Its filename was s3c2410_wdt-fix-build-breakage.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: s3c2410_wdt: fix build breakage From: Russell King <rmk@xxxxxxxxxxxxxxxx> Not sure what happened, but it looks like a mismerge in 41dc8b72e37c514f7332cbc3f3dd864910c2a1fa ("s3c2410_wdt watchdog driver: Locking and coding style"). We seem to have two functions which are almost identical called the same thing... CC drivers/watchdog/s3c2410_wdt.o drivers/watchdog/s3c2410_wdt.c:130: error: redefinition of '__s3c2410wdt_stop' drivers/watchdog/s3c2410_wdt.c:119: error: previous definition of '__s3c2410wdt_stop' was here drivers/watchdog/s3c2410_wdt.c: In function `s3c2410wdt_start': drivers/watchdog/s3c2410_wdt.c:172: warning: `return' with a value, in function returning void drivers/watchdog/s3c2410_wdt.c: At top level: drivers/watchdog/s3c2410_wdt.c:119: warning: '__s3c2410wdt_stop' defined but not used Acked-by: Ben Dooks <ben-linux@xxxxxxxxx> Cc: Wim Van Sebroeck <wim@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/s3c2410_wdt.c | 13 ------------- 1 file changed, 13 deletions(-) diff -puN drivers/watchdog/s3c2410_wdt.c~s3c2410_wdt-fix-build-breakage drivers/watchdog/s3c2410_wdt.c --- a/drivers/watchdog/s3c2410_wdt.c~s3c2410_wdt-fix-build-breakage +++ a/drivers/watchdog/s3c2410_wdt.c @@ -119,17 +119,6 @@ static void __s3c2410wdt_stop(void) { unsigned long wtcon; - spin_lock(&wdt_lock); - wtcon = readl(wdt_base + S3C2410_WTCON); - wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN); - writel(wtcon, wdt_base + S3C2410_WTCON); - spin_unlock(&wdt_lock); -} - -static void __s3c2410wdt_stop(void) -{ - unsigned long wtcon; - wtcon = readl(wdt_base + S3C2410_WTCON); wtcon &= ~(S3C2410_WTCON_ENABLE | S3C2410_WTCON_RSTEN); writel(wtcon, wdt_base + S3C2410_WTCON); @@ -168,8 +157,6 @@ static void s3c2410wdt_start(void) writel(wdt_count, wdt_base + S3C2410_WTCNT); writel(wtcon, wdt_base + S3C2410_WTCON); spin_unlock(&wdt_lock); - - return 0; } static int s3c2410wdt_set_heartbeat(int timeout) _ Patches currently in -mm which might be from rmk@xxxxxxxxxxxxxxxx are origin.patch arm-use-bcd2bin-bin2bcd.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