summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Sutter <n0-1@freewrt.org>2009-02-08 16:44:42 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-03-16 17:52:48 -0700
commit5c3ffea8da2f2e19ce9f795eeba93a5ddb567a56 (patch)
treeddad59d3918a73caeb8fdc3935e99e248f3adb98
parent6460528633c6a33cb6a627bbe9315a6175f48c0c (diff)
downloadlwn-5c3ffea8da2f2e19ce9f795eeba93a5ddb567a56.tar.gz
lwn-5c3ffea8da2f2e19ce9f795eeba93a5ddb567a56.zip
WATCHDOG: rc32434_wdt: fix sections
commit d9a8798c4bab5ccd40e45e011f668099cfb3eb83 upstream. Fix init and exit sections. Signed-off-by: Phil Sutter <n0-1@freewrt.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/watchdog/rc32434_wdt.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index ea2764325224..e96f2ef3784c 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -33,7 +33,7 @@
#include <asm/time.h>
#include <asm/mach-rc32434/integ.h>
-#define VERSION "0.3"
+#define VERSION "0.4"
static struct {
unsigned long inuse;
@@ -241,10 +241,10 @@ static struct miscdevice rc32434_wdt_miscdev = {
.fops = &rc32434_wdt_fops,
};
-static char banner[] = KERN_INFO KBUILD_MODNAME
+static char banner[] __devinitdata = KERN_INFO KBUILD_MODNAME
": Watchdog Timer version " VERSION ", timer margin: %d sec\n";
-static int rc32434_wdt_probe(struct platform_device *pdev)
+static int __devinit rc32434_wdt_probe(struct platform_device *pdev)
{
int ret;
struct resource *r;
@@ -279,7 +279,7 @@ unmap:
return ret;
}
-static int rc32434_wdt_remove(struct platform_device *pdev)
+static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
{
misc_deregister(&rc32434_wdt_miscdev);
iounmap(wdt_reg);
@@ -288,8 +288,8 @@ static int rc32434_wdt_remove(struct platform_device *pdev)
static struct platform_driver rc32434_wdt = {
.probe = rc32434_wdt_probe,
- .remove = rc32434_wdt_remove,
- .driver = {
+ .remove = __devexit_p(rc32434_wdt_remove),
+ .driver = {
.name = "rc32434_wdt",
}
};