Merge tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel...

Defconfig (exynos and multi_v7) changes for Exynos based boards for 4.5:
1. Enable Maxim 8997 and 77693 family drivers (charger, extcon, LED,
   RTC, haptic/motor, regulator).
2. Build ChromeOS EC drivers as modules on multi_v7.
3. Enable drivers important for Exynos4210-based Universal C210 board.
4. Enable NFSv4 client.
5. On exynos_defconfig set some options to a value recommended
   by systemd. This also makes it more consistent with multi_v7.

* tag 'samsung-defconfig-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos_defconfig: Set recommended options for systemd
  ARM: exynos_defconfig: Enable NFSv4 client
  ARM: exynos_defconfig: Add drivers for Exynos4210 Universal C210 board
  ARM: multi_v7_defconfig: Build ChromeOS EC drivers as modules
  ARM: multi_v7_defconfig: Enable Maxim 77693 LED and haptic drivers
  ARM: multi_v7_defconfig: Enable Maxim 8997 family drivers
  ARM: exynos_defconfig: Enable Maxim 77693 LED and haptic drivers
  ARM: exynos_defconfig: Enable Maxim 8997 family drivers

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/configs/multi_v7_defconfig
index 367eb14,e191a08..449fce8
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -259,8 -252,10 +259,10 @@@ CONFIG_TOUCHSCREEN_STMPE=
  CONFIG_TOUCHSCREEN_SUN4I=y
  CONFIG_TOUCHSCREEN_WM97XX=m
  CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_MAX77693_HAPTIC=m
+ CONFIG_INPUT_MAX8997_HAPTIC=m
  CONFIG_INPUT_MPU3050=y
 -CONFIG_INPUT_AXP20X_PEK=y
 +CONFIG_INPUT_AXP20X_PEK=m
  CONFIG_INPUT_ADXL34X=m
  CONFIG_SERIO_AMBAKMI=y
  CONFIG_SERIAL_8250=y
@@@ -382,8 -367,8 +384,9 @@@ CONFIG_BATTERY_MAX17040=
  CONFIG_BATTERY_MAX17042=m
  CONFIG_CHARGER_MAX14577=m
  CONFIG_CHARGER_MAX77693=m
+ CONFIG_CHARGER_MAX8997=m
  CONFIG_CHARGER_TPS65090=y
 +CONFIG_AXP20X_POWER=m
  CONFIG_POWER_RESET_AS3722=y
  CONFIG_POWER_RESET_GPIO=y
  CONFIG_POWER_RESET_GPIO_RESTART=y
@@@ -416,11 -400,9 +419,11 @@@ CONFIG_MFD_AS3722=
  CONFIG_MFD_ATMEL_FLEXCOM=y
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_AXP20X=y
- CONFIG_MFD_CROS_EC=y
 +CONFIG_MFD_AXP20X_I2C=m
 +CONFIG_MFD_AXP20X_RSB=m
+ CONFIG_MFD_CROS_EC=m
  CONFIG_MFD_CROS_EC_I2C=m
- CONFIG_MFD_CROS_EC_SPI=y
+ CONFIG_MFD_CROS_EC_SPI=m
  CONFIG_MFD_MAX14577=y
  CONFIG_MFD_MAX77686=y
  CONFIG_MFD_MAX77693=y