summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-fslc/defconfig
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2019-06-05 17:32:28 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2019-06-21 18:16:27 -0300
commit0552378a5b1b32d70e09c550354d34b34a9595c5 (patch)
treeed7fa1b8183a857c9e441db45d1e6fd4d0f71ea2 /recipes-kernel/linux/linux-fslc/defconfig
parent6d9e595a27338ac7953950cf8957687b715ba34a (diff)
downloadmeta-freescale-0552378a5b1b32d70e09c550354d34b34a9595c5.tar.gz
linux-fslc: Upgrade to version 5.1.x
This commit merges tag v5.1.12 into 5.1.x+fslc. Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Diffstat (limited to 'recipes-kernel/linux/linux-fslc/defconfig')
-rw-r--r--recipes-kernel/linux/linux-fslc/defconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig
index cc0677b5..2d1159b0 100644
--- a/recipes-kernel/linux/linux-fslc/defconfig
+++ b/recipes-kernel/linux/linux-fslc/defconfig
@@ -312,7 +312,6 @@ CONFIG_USB=y
312CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 312CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
313CONFIG_USB_EHCI_HCD=y 313CONFIG_USB_EHCI_HCD=y
314CONFIG_USB_EHCI_MXC=y 314CONFIG_USB_EHCI_MXC=y
315CONFIG_USB_PRINTER=m
316CONFIG_USB_STORAGE=y 315CONFIG_USB_STORAGE=y
317CONFIG_USB_CHIPIDEA=y 316CONFIG_USB_CHIPIDEA=y
318CONFIG_USB_CHIPIDEA_UDC=y 317CONFIG_USB_CHIPIDEA_UDC=y
@@ -320,7 +319,6 @@ CONFIG_USB_CHIPIDEA_HOST=y
320CONFIG_USB_SERIAL=m 319CONFIG_USB_SERIAL=m
321CONFIG_USB_SERIAL_GENERIC=y 320CONFIG_USB_SERIAL_GENERIC=y
322CONFIG_USB_SERIAL_FTDI_SIO=m 321CONFIG_USB_SERIAL_FTDI_SIO=m
323CONFIG_USB_SERIAL_PL2303=m
324CONFIG_USB_SERIAL_OPTION=m 322CONFIG_USB_SERIAL_OPTION=m
325CONFIG_USB_TEST=m 323CONFIG_USB_TEST=m
326CONFIG_USB_EHSET_TEST_FIXTURE=m 324CONFIG_USB_EHSET_TEST_FIXTURE=m
@@ -399,7 +397,7 @@ CONFIG_MAG3110=y
399CONFIG_MPL3115=y 397CONFIG_MPL3115=y
400CONFIG_PWM=y 398CONFIG_PWM=y
401CONFIG_PWM_FSL_FTM=y 399CONFIG_PWM_FSL_FTM=y
402CONFIG_PWM_IMX=y 400CONFIG_PWM_IMX27=y
403CONFIG_NVMEM_IMX_OCOTP=y 401CONFIG_NVMEM_IMX_OCOTP=y
404CONFIG_NVMEM_VF610_OCOTP=y 402CONFIG_NVMEM_VF610_OCOTP=y
405CONFIG_TEE=y 403CONFIG_TEE=y