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

arch/arm/configs/odroidxu3_defconfig

@@ -1989,7 +1989,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
 

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)
 {