From edc2621facf8147e02f7a3d929220106d5bd94db Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 7 Mar 2012 09:36:22 +0100 Subject: linux-ti33x-psp 3.2: enable CONFIG_WATCHDOG_NOWAYOUT for beaglebone Signed-off-by: Koen Kooi Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig | 4 ++-- recipes-kernel/linux/linux-ti33x-psp_3.2.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig index c5b80d17..782f52da 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig @@ -1769,8 +1769,8 @@ CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m # CONFIG_THERMAL is not set CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_CORE is not set -# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_NOWAYOUT=y # # Watchdog Device Drivers diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index b2f706af..79a315a1 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb @@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = "" BRANCH = "v3.2-staging" SRCREV = "09e9651bcf2ee8d86685f2a8075bc6557b1d3b91" -MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" COMPATIBLE_MACHINE = "(ti33x)" -- cgit v1.2.3-54-g00ecf