Message ID | 359509a565280b2fb66c1ed94d61f9a04cdef356.1238163923.git.ext-atal.shargorodsky@nokia.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 6d8f62040f0d095e78d92213f3daa5bb525a510a |
Delegated to: | Tony Lindgren |
Headers | show |
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Branch in linux-omap: omap3-upstream Initial commit ID (Likely to change): 6d8f62040f0d095e78d92213f3daa5bb525a510a PatchWorks http://patchwork.kernel.org/patch/14747/ Git (Likely to change, and takes a while to get mirrored) http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=6d8f62040f0d095e78d92213f3daa5bb525a510a -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index 67fd8ec..8f01b81 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig @@ -1051,6 +1051,7 @@ CONFIG_WATCHDOG=y # # CONFIG_SOFT_WATCHDOG is not set CONFIG_OMAP_WATCHDOG=m +CONFIG_TWL4030_WATCHDOG=m # # USB-based Watchdog Cards