diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-07 09:36:22 +0100 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-03-07 16:51:49 -0500 |
commit | edc2621facf8147e02f7a3d929220106d5bd94db (patch) | |
tree | 9300c24bbbcd359112a46a67f7dcc0c58b28b33d | |
parent | aa24c8ba605c38aaa48d2ca7252fc71bfae755ee (diff) | |
download | meta-ti-edc2621facf8147e02f7a3d929220106d5bd94db.tar.gz |
linux-ti33x-psp 3.2: enable CONFIG_WATCHDOG_NOWAYOUT for beaglebone
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/defconfig | 4 | ||||
-rw-r--r-- | 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 | |||
1769 | CONFIG_SENSORS_W83627EHF=m | 1769 | CONFIG_SENSORS_W83627EHF=m |
1770 | # CONFIG_THERMAL is not set | 1770 | # CONFIG_THERMAL is not set |
1771 | CONFIG_WATCHDOG=y | 1771 | CONFIG_WATCHDOG=y |
1772 | # CONFIG_WATCHDOG_CORE is not set | 1772 | CONFIG_WATCHDOG_CORE=y |
1773 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1773 | CONFIG_WATCHDOG_NOWAYOUT=y |
1774 | 1774 | ||
1775 | # | 1775 | # |
1776 | # Watchdog Device Drivers | 1776 | # 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 = "" | |||
11 | 11 | ||
12 | BRANCH = "v3.2-staging" | 12 | BRANCH = "v3.2-staging" |
13 | SRCREV = "09e9651bcf2ee8d86685f2a8075bc6557b1d3b91" | 13 | SRCREV = "09e9651bcf2ee8d86685f2a8075bc6557b1d3b91" |
14 | MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" | 14 | MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" |
15 | 15 | ||
16 | COMPATIBLE_MACHINE = "(ti33x)" | 16 | COMPATIBLE_MACHINE = "(ti33x)" |
17 | 17 | ||