diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-17 13:17:30 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-17 13:17:30 +0800 |
| commit | 3b9608406bb699de5ff02760c745e62212b4c280 (patch) | |
| tree | 1cedd6fff5d0c2f512cee15f74fb9dc867b7e328 /arch/arm/configs | |
| parent | bc275dcec0026997a8a8b685ce65c6f766ff38ce (diff) | |
| parent | 556681e28fda1c92eb2178306904a7df87f37449 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_androidjb4.2.2_1.0.0-ga
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index fc897eddcfa3..5ad4a002676d 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -331,6 +331,7 @@ CONFIG_ARCH_MXC_AUDMUX_V2=y CONFIG_IRAM_ALLOC=y CONFIG_CLK_DEBUG=y CONFIG_DMA_ZONE_SIZE=184 +#CONFIG_MX6_ENET_IRQ_TO_GPIO is not set # # System MMU |