Merge branch 'odroidxu3-3.10.y'

68c55c48 · Mauro Ribeiro · 7fa4eb86 · cf0381c8 · 68c55c48 · 68c55c48
Commit 68c55c48 authored Aug 27, 2015 by Mauro Ribeiro
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

arch/arm/configs/odroidxu3_defconfig arch/arm/configs/odroidxu3_defconfig +1 -1

arch/arm/mach-exynos/pmu-exynos5422.c arch/arm/mach-exynos/pmu-exynos5422.c +1 -0

No files found.
--- a/arch/arm/configs/odroidxu3_defconfig
+++ b/arch/arm/configs/odroidxu3_defconfig
@@ -1996,7 +1996,7 @@ CONFIG_WATCHDOG_CORE=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_HAVE_S3C2410_WATCHDOG=y
-CONFIG_S3C2410_WATCHDOG=y
+CONFIG_S3C2410_WATCHDOG=m
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set


--- a/arch/arm/mach-exynos/pmu-exynos5422.c
+++ b/arch/arm/mach-exynos/pmu-exynos5422.c
@@ -557,6 +557,7 @@ void exynos_pmu_wdt_control(bool on, unsigned int pmu_wdt_reset_type)

 	return;
 }
+EXPORT_SYMBOL(exynos_pmu_wdt_control);

 void exynos_sys_powerdown_conf(enum sys_powerdown mode)
 {