Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[safe/jmp/linux-2.6] / drivers / watchdog / mtx-1_wdt.c

diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 3acce62..08e8a6a 100644 (file)
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -5,7 +5,7 @@
  *                                                     All Rights Reserved.
  *                              http://www.4g-systems.biz
  *
- *     (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
+ *     (C) Copyright 2007 OpenWrt.org, Florian Fainelli <florian@openwrt.org>
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -206,7 +206,7 @@ static struct miscdevice mtx1_wdt_misc = {
 };
 
 
-static int mtx1_wdt_probe(struct platform_device *pdev)
+static int __devinit mtx1_wdt_probe(struct platform_device *pdev)
 {
        int ret;
 
@@ -229,7 +229,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int mtx1_wdt_remove(struct platform_device *pdev)
+static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
 {
        /* FIXME: do we need to lock this test ? */
        if (mtx1_wdt_device.queue) {
@@ -242,7 +242,7 @@ static int mtx1_wdt_remove(struct platform_device *pdev)
 
 static struct platform_driver mtx1_wdt = {
        .probe = mtx1_wdt_probe,
-       .remove = mtx1_wdt_remove,
+       .remove = __devexit_p(mtx1_wdt_remove),
        .driver.name = "mtx1-wdt",
        .driver.owner = THIS_MODULE,
 };