diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 21:03:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 21:03:10 -0700 |
| commit | f8a26083ec10d5ca14551e62bbfbfd34b0fd2296 (patch) | |
| tree | de9563bfbec337cd8dba65a7d8fb5665bbdbe51c /arch/arm | |
| parent | 29b5f29894ac75570ae30cd9e0604d350fcc3412 (diff) | |
| parent | 82cc56ccf127899cde1d74a0380c29814ceb1b71 (diff) | |
| download | linux-f8a26083ec10d5ca14551e62bbfbfd34b0fd2296.tar.gz linux-f8a26083ec10d5ca14551e62bbfbfd34b0fd2296.tar.bz2 linux-f8a26083ec10d5ca14551e62bbfbfd34b0fd2296.zip | |
Merge tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/defconfig
Enable mtdtests and USB NCM gadget in DaVinci kernel
(as modules).
* tag 'davinci-for-v4.13/defconfig-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci_all_defconfig: enable USB CDC NCM gadget
ARM: davinci_all_defconfig: enable mtdtests
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 7f726277dd1b..06e2e2a1a9be 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -58,6 +58,7 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_FW_LOADER is not set CONFIG_DA8XX_MSTPRI=y CONFIG_MTD=m +CONFIG_MTD_TESTS=m CONFIG_MTD_BLOCK=m CONFIG_MTD_CFI=m CONFIG_MTD_CFI_INTELEXT=m @@ -185,6 +186,7 @@ CONFIG_USB_GADGET_DEBUG_FILES=y CONFIG_USB_GADGET_DEBUG_FS=y CONFIG_USB_ZERO=m CONFIG_USB_ETH=m +CONFIG_USB_G_NCM=m CONFIG_USB_GADGETFS=m CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m |