Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01ba96df authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-defconfig-4.8' of... 

Merge tag 'imx-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig

The i.MX defconfig update for 4.8:
 - Enable TOUCHSCREEN_ADS7846, USB_FUNCTIONFS and USB_USBNET support

* tag 'imx-defconfig-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: imx_v6_v7_defconfig: Select ADS7846 support
  ARM: imx_v6_v7_defconfig: enable USB FFS gadget
  ARM: imx_v6_v7_defconfig: build in usbnet to support NFS for non-ethernet board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a963e092 b57d82d7

arch/arm/configs/imx_v6_v7_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ CONFIG_MICREL_PHY=y 
CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=m

CONFIG_USB_USBNET=m

CONFIG_USB_USBNET=y

CONFIG_USB_NET_CDC_EEM=m

CONFIG_BRCMFMAC=m

CONFIG_WL12XX=m
@@ -161,6 +161,7 @@ CONFIG_KEYBOARD_IMX=y 
CONFIG_MOUSE_PS2=m

CONFIG_MOUSE_PS2_ELANTECH=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ADS7846=y

CONFIG_TOUCHSCREEN_EGALAX=y

CONFIG_TOUCHSCREEN_IMX6UL_TSC=y

CONFIG_TOUCHSCREEN_EDT_FT5X06=y
@@ -296,6 +297,7 @@ CONFIG_USB_ZERO=m 
CONFIG_USB_ETH=m

CONFIG_USB_G_NCM=m

CONFIG_USB_GADGETFS=m

CONFIG_USB_FUNCTIONFS=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_USB_G_SERIAL=m

CONFIG_MMC=y