From: Olof Johansson Date: Mon, 26 Oct 2015 01:19:41 +0000 (+0900) Subject: Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3af37f0228232d1ad1963c559aaa86dc48a8cfc2;p=linux-beck.git Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/defconfig 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 --- 3af37f0228232d1ad1963c559aaa86dc48a8cfc2 diff --cc arch/arm/configs/multi_v7_defconfig index 10dbe3a5acb3,bd8e8ca888f1..087b6a3e8a76 --- a/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