diff options
| author | Dong Aisheng <b29396@freescale.com> | 2014-06-19 19:19:44 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-01-15 21:17:31 -0600 |
| commit | 24ec3e28d93cbcc70920542da3c426d55aa5fc91 (patch) | |
| tree | f48a3125f7223299576e44499e84c299ca5e7876 /arch/arm/configs | |
| parent | 34482f4d914a41013701a850821b4be1516f7254 (diff) | |
ENGR00319455-4 imx_v7_defconfig: enable canfd by default
enable canfd by default.
The defconfig is generated by make ARCH=arm savedefconfig
which got the uneeded CONFIG_USB_PHY removed.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 0d6fbbce14deea6faba1a6dc9b9866b70a0e4c2f)
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 86a1b2de6631..663ae71c4471 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -67,6 +67,7 @@ CONFIG_NETFILTER=y CONFIG_VLAN_8021Q=y CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y +CONFIG_CAN_M_CAN=y CONFIG_CFG80211=y CONFIG_MAC80211=y CONFIG_RFKILL=y |