diff options
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 2755a441c5a..3d0bfc1d362 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.38 Kernel Configuration -# Mon Oct 31 18:13:45 2011 +# Wed Nov 2 16:21:15 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -258,6 +258,7 @@ CONFIG_ARCH_MXC=y CONFIG_GPIO_PCA953X=y CONFIG_IMX_HAVE_PLATFORM_DMA=y CONFIG_IMX_HAVE_PLATFORM_FEC=y +CONFIG_IMX_HAVE_PLATFORM_FLEXCAN=y CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y CONFIG_IMX_HAVE_PLATFORM_GPMI_NFC=y CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y @@ -576,7 +577,19 @@ CONFIG_CAN_BCM=y # CONFIG_CAN_VCAN=y # CONFIG_CAN_SLCAN is not set -# CONFIG_CAN_DEV is not set +CONFIG_CAN_DEV=y +CONFIG_CAN_CALC_BITTIMING=y +# CONFIG_CAN_MCP251X is not set +CONFIG_HAVE_CAN_FLEXCAN=y +CONFIG_CAN_FLEXCAN=y +# CONFIG_CAN_SJA1000 is not set + +# +# CAN USB interfaces +# +# CONFIG_CAN_EMS_USB is not set +# CONFIG_CAN_ESD_USB2 is not set +# CONFIG_CAN_SOFTING is not set CONFIG_CAN_DEBUG_DEVICES=y # CONFIG_IRDA is not set CONFIG_BT=y |