From b89606edde3c8b1a31405486b66b17f14edc99ca Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Sun, 23 Dec 2012 22:03:36 +0200 Subject: [PATCH] --- yaml --- r: 348131 b: refs/heads/master c: 412b3729dd0234771c67452b8999191f1e8d8630 h: refs/heads/master i: 348129: ee42be37c1c1558ff453d8e5542b2f97dd018105 348127: 7a332d1c9d4709f6ef8f43c0280a4a3d4521a3f3 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/omap_wdt.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 53c6580acb4f..c87e2fbff714 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98e4a293895dda2b74476ac3a9f79c58b5d0155a +refs/heads/master: 412b3729dd0234771c67452b8999191f1e8d8630 diff --git a/trunk/drivers/watchdog/omap_wdt.c b/trunk/drivers/watchdog/omap_wdt.c index 34ed61ea02b4..b0e541d022e6 100644 --- a/trunk/drivers/watchdog/omap_wdt.c +++ b/trunk/drivers/watchdog/omap_wdt.c @@ -296,7 +296,6 @@ static int omap_wdt_remove(struct platform_device *pdev) { struct watchdog_device *wdog = platform_get_drvdata(pdev); struct omap_wdt_dev *wdev = watchdog_get_drvdata(wdog); - struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); pm_runtime_disable(wdev->dev); watchdog_unregister_device(wdog);