diff options
author | Dong Aisheng <b29396@freescale.com> | 2014-06-19 07:19:44 -0400 |
---|---|---|
committer | Dong Aisheng <b29396@freescale.com> | 2014-06-20 02:00:13 -0400 |
commit | af51180cd6df6117cea5b87602373fa29a7ca557 (patch) | |
tree | 177cca1d08c2f3ed447d970c41a15d8a49f939ad | |
parent | 4d7797bf66c59204534d8dcf53d632293965debe (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>
-rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 06064d6b59f1..ff1b66c9e1cd 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig | |||
@@ -64,6 +64,7 @@ CONFIG_VLAN_8021Q=y | |||
64 | CONFIG_LLC2=y | 64 | CONFIG_LLC2=y |
65 | CONFIG_CAN=y | 65 | CONFIG_CAN=y |
66 | CONFIG_CAN_FLEXCAN=y | 66 | CONFIG_CAN_FLEXCAN=y |
67 | CONFIG_CAN_M_CAN=y | ||
67 | CONFIG_CFG80211=y | 68 | CONFIG_CFG80211=y |
68 | CONFIG_CFG80211_WEXT=y | 69 | CONFIG_CFG80211_WEXT=y |
69 | CONFIG_MAC80211=y | 70 | CONFIG_MAC80211=y |
@@ -252,7 +253,6 @@ CONFIG_USB_STORAGE=y | |||
252 | CONFIG_USB_CHIPIDEA=y | 253 | CONFIG_USB_CHIPIDEA=y |
253 | CONFIG_USB_CHIPIDEA_UDC=y | 254 | CONFIG_USB_CHIPIDEA_UDC=y |
254 | CONFIG_USB_CHIPIDEA_HOST=y | 255 | CONFIG_USB_CHIPIDEA_HOST=y |
255 | CONFIG_USB_PHY=y | ||
256 | CONFIG_NOP_USB_XCEIV=y | 256 | CONFIG_NOP_USB_XCEIV=y |
257 | CONFIG_USB_MXS_PHY=y | 257 | CONFIG_USB_MXS_PHY=y |
258 | CONFIG_USB_GADGET=y | 258 | CONFIG_USB_GADGET=y |