watchdog: twl4030_wdt: disable autoload

3.2 doesn't allow multiple watchdogs (fails to register misc device),
and we already always have OMAP watchdog loaded, so disable twl4030_wdt.
To use twl4030_wdt driver, the user needs these manual steps:
  echo omap_wdt > /sys/bus/platform/drivers/omap_wdt/unbind
  modprobe twl4030_wdt

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_AUTHOR("Nokia Corporation");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);

-MODULE_ALIAS("platform:twl4030_wdt");
+/* MODULE_ALIAS("platform:twl4030_wdt"); */