Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / watchdog / twl4030_wdt.c

diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c
index b5045ca..39a3ef4 100644 (file)
--- a/drivers/watchdog/twl4030_wdt.c
+++ b/drivers/watchdog/twl4030_wdt.c
@@ -271,5 +271,5 @@ module_exit(twl4030_wdt_exit);
 MODULE_AUTHOR("Nokia Corporation");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:twl4030_wdt");
+/* MODULE_ALIAS("platform:twl4030_wdt"); */