From: Mahesh Mahadevan Date: Wed, 30 Oct 2013 18:52:53 +0000 (+0000) Subject: linux-imx (2.6.35.3): Sync i.MX5 defconfig with the one in the kernel X-Git-Tag: 2.1~1148 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5c95ac2b12675ba07a0a3598c23f5b47a8c3d6f0;p=meta-freescale.git linux-imx (2.6.35.3): Sync i.MX5 defconfig with the one in the kernel Enable CONFIG_FEC_NAPI option. This was disabled earlier as it was causing a crash during boot, this issue has been fixed by commit: ENGR00266268 net: fec: napi cause system crash Signed-off-by: Mahesh Mahadevan --- diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig index 94323bc0..213a06d7 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mx5/defconfig @@ -877,7 +877,7 @@ CONFIG_SMSC911X=y # CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set CONFIG_FEC=y -# CONFIG_FEC_NAPI is not set +CONFIG_FEC_NAPI=y # CONFIG_FEC_1588 is not set # CONFIG_FEC2 is not set # CONFIG_NETDEV_1000 is not set