aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-06-15 19:15:52 +0200
committerWim Van Sebroeck <wim@iguana.be>2011-06-28 07:42:40 +0000
commitdb98f89a2807966c6e82601f5c57e1a9c214c91a (patch)
treeade414c94b17dbdb730a2cf26cf7124b518c2332
parent2ea4e76e997019ae25ac3417aa46e31ddf7ecb17 (diff)
downloadkernel_goldelico_gta04-db98f89a2807966c6e82601f5c57e1a9c214c91a.zip
kernel_goldelico_gta04-db98f89a2807966c6e82601f5c57e1a9c214c91a.tar.gz
kernel_goldelico_gta04-db98f89a2807966c6e82601f5c57e1a9c214c91a.tar.bz2
watchdog: mtx1-wdt: fix section mismatch
Fix section mismatch and remove unused variable 'tmp'. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/mtx-1_wdt.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 54aa900..0430e09 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -71,8 +71,6 @@ static struct {
static void mtx1_wdt_trigger(unsigned long unused)
{
- u32 tmp;
-
spin_lock(&mtx1_wdt_device.lock);
if (mtx1_wdt_device.running)
ticks--;
@@ -248,7 +246,7 @@ static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
return 0;
}
-static struct platform_driver mtx1_wdt = {
+static struct platform_driver mtx1_wdt_driver = {
.probe = mtx1_wdt_probe,
.remove = __devexit_p(mtx1_wdt_remove),
.driver.name = "mtx1-wdt",
@@ -257,12 +255,12 @@ static struct platform_driver mtx1_wdt = {
static int __init mtx1_wdt_init(void)
{
- return platform_driver_register(&mtx1_wdt);
+ return platform_driver_register(&mtx1_wdt_driver);
}
static void __exit mtx1_wdt_exit(void)
{
- platform_driver_unregister(&mtx1_wdt);
+ platform_driver_unregister(&mtx1_wdt_driver);
}
module_init(mtx1_wdt_init);