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

Samsung defconfig udpates for v4.4

- exynos_defconfig
  : enable USB Video Class for Peach boards.
  : enable DWC2 USB and USB ethernet gadget
  : enable LEDs (LEGS_GPIO and LEDS_PWM)for Odroid-XU3/XU4
  : enable RTL8152 for Odroid-XU4
  : enable WiFi-Ex as a module instead of build-in
  : disable temporal simplefb support (FB_SIMPLE) because
    exynos DRM driver can support it now

- multi_v7_defconfig
  : enable DWC2 USB and USB ethernet gadget
  : enable RTL8152 for Odroid-XU4

* tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: multi_v7_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable WiFi-Ex as a module instead built-in
  ARM: exynos_defconfig: Disable simplefb support
  ARM: exynos_defconfig: Enable LEDS for Odroid-XU3/XU4
  ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable USB Video Class support

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

diff --cc arch/arm/configs/multi_v7_defconfig
index 10dbe3a5acb3ba9d9c531fde8d3f3a697734711e,bd8e8ca888f1e771c9836580b73035bbb8f7eb42..087b6a3e8a763ab35aea38e7ab603f98ef9cae99
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -223,8 -220,8 +223,9 @@@ CONFIG_SMSC_PHY=
  CONFIG_BROADCOM_PHY=y
  CONFIG_ICPLUS_PHY=y
  CONFIG_MICREL_PHY=y
 +CONFIG_FIXED_PHY=y
  CONFIG_USB_PEGASUS=y
+ CONFIG_USB_RTL8152=m
  CONFIG_USB_USBNET=y
  CONFIG_USB_NET_SMSC75XX=y
  CONFIG_USB_NET_SMSC95XX=y