diff --git a/[refs] b/[refs] index 2f8afd47146b..17d39a60ca7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 +refs/heads/master: c1ec8295f6e8c888230bbc9b7a416dc26d03688e diff --git a/trunk/drivers/watchdog/s3c2410_wdt.c b/trunk/drivers/watchdog/s3c2410_wdt.c index 44bf5e4282e1..c417fb5e913f 100644 --- a/trunk/drivers/watchdog/s3c2410_wdt.c +++ b/trunk/drivers/watchdog/s3c2410_wdt.c @@ -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;