Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1ec8295 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Fix up duplicate '__s3c2410wdt_stop()' function 



Looks like somebody didn't get enough sleep.

Noticed-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d8cd0c5

drivers/watchdog/s3c2410_wdt.c

+0 −11
Original line number Diff line number Diff line
@@ -115,17 +115,6 @@ static void s3c2410wdt_keepalive(void) 
	spin_unlock(&wdt_lock);

}



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;