diff options
| author | Zhou Jingyu <b02241@freescale.com> | 2011-03-02 16:28:25 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 19:53:52 +0800 |
| commit | e46c868419024af419283854a62a2ea525a33304 (patch) | |
| tree | 2f012baeae2c810eed20f81827602580bbe69d47 /drivers/watchdog | |
| parent | 3b91b5ac920ba4e716afb8618ee10d6fb7711852 (diff) | |
ENGR00141391-2 PMIC: porting da9053 to i.mx platform
Fix da9053 backlight Kconfig error
porting da9052 regulator driver
Signed-off-by: Zhou Jingyu <Jingyu.Zhou@freescale.com>
Acked-by: Lily Zhang <r58066@freescale.com>
Diffstat (limited to 'drivers/watchdog')
| -rwxr-xr-x[-rw-r--r--] | drivers/watchdog/Kconfig | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | drivers/watchdog/Makefile | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 21d816e9dfa5..8598a4b09622 100644..100755 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1230,6 +1230,11 @@ config WDTPCI To compile this driver as a module, choose M here: the module will be called wdt_pci. +config DA9052_WATCHDOG + tristate "Dialog DA9052 Watchdog" + depends on PMIC_DIALOG + help + Support for the watchdog in the DA9052 PMIC. # # USB-based Watchdog Cards # diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index ed26f7094e47..fae2cfcca711 100644..100755 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -159,3 +159,4 @@ obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o obj-$(CONFIG_MAX63XX_WATCHDOG) += max63xx_wdt.o obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o +obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o |