From: Grazvydas Ignotas <notasas@gmail.com>
Date: Fri, 3 Jul 2015 21:38:29 +0000 (+0300)
Subject: watchdog: twl4030_wdt: disable autoload
X-Git-Tag: sz_173~13
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=60c16f13a93a8fde7434149d8c6bc55cb6e5398e

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 b5045ca7e61c..39a3ef4fbf70 100644
--- 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"); */