| Message ID | 1391257504-6502-1-git-send-email-ivan.khoronzhuk@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig index a018244..061ec999 100644 --- a/arch/arm/configs/keystone_defconfig +++ b/arch/arm/configs/keystone_defconfig @@ -131,6 +131,8 @@ CONFIG_SPI_DAVINCI=y CONFIG_SPI_SPIDEV=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +CONFIG_DAVINCI_WATCHDOG=y CONFIG_USB=y CONFIG_USB_DEBUG=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
Keystone SoC uses the same watchdog driver as Davinci, so enable WDT and core used by it. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Conflicts: arch/arm/configs/keystone_defconfig --- Rebased on git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/master arch/arm/configs/keystone_defconfig | 2 ++ 1 file changed, 2 insertions(+)