diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-06 07:15:26 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-06 07:15:26 +0300 |
| commit | 01ba96dff153d259cd96ec0587db056be2067eaf (patch) | |
| tree | d39fc0108b5dcaf7518c5fbf9ccb22878b7afa1e /arch/arm/configs | |
| parent | a963e0924017a37c6dc41a79e5ff9f549de3f42c (diff) | |
| parent | b57d82d7bafeda5d82d3426dc4ad8a50a82a867c (diff) | |
| download | linux-01ba96dff153d259cd96ec0587db056be2067eaf.tar.xz | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 21339ce29654..3219480b9dbf 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -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 |