Commit cf0381c8 authored by Mauro Ribeiro's avatar Mauro Ribeiro Committed by Gerrit Code Review

Merge changes Ia8062c71,I7b3aa8bb into odroidxu3-3.10.y

* changes:
  pmu-exynos522: export symbol exynos_pmu_wdt_control
  odroidxu3_defconfig: disable watchdog S3C2410_WATCHDOG from loading
parents c2e1cd80 ed14163c
...@@ -1989,7 +1989,7 @@ CONFIG_WATCHDOG_CORE=y ...@@ -1989,7 +1989,7 @@ CONFIG_WATCHDOG_CORE=y
# CONFIG_SOFT_WATCHDOG is not set # CONFIG_SOFT_WATCHDOG is not set
# CONFIG_ARM_SP805_WATCHDOG is not set # CONFIG_ARM_SP805_WATCHDOG is not set
CONFIG_HAVE_S3C2410_WATCHDOG=y CONFIG_HAVE_S3C2410_WATCHDOG=y
CONFIG_S3C2410_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=m
# CONFIG_DW_WATCHDOG is not set # CONFIG_DW_WATCHDOG is not set
# CONFIG_MAX63XX_WATCHDOG is not set # CONFIG_MAX63XX_WATCHDOG is not set
......
...@@ -557,6 +557,7 @@ void exynos_pmu_wdt_control(bool on, unsigned int pmu_wdt_reset_type) ...@@ -557,6 +557,7 @@ void exynos_pmu_wdt_control(bool on, unsigned int pmu_wdt_reset_type)
return; return;
} }
EXPORT_SYMBOL(exynos_pmu_wdt_control);
void exynos_sys_powerdown_conf(enum sys_powerdown mode) void exynos_sys_powerdown_conf(enum sys_powerdown mode)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment