From: Ryan QIAN Date: Thu, 8 Dec 2011 05:38:33 +0000 (+0800) Subject: ENGR00169782 [MX6Q]: Add new AR6003 driver to 2.6.38, replacing staging one X-Git-Tag: v3.0.35-fsl_4.1.0~1961 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=02293fbbe99014810dcd1672d2b07bee7732f825;p=karo-tx-linux.git ENGR00169782 [MX6Q]: Add new AR6003 driver to 2.6.38, replacing staging one - remove the staging driver from default config of MX6 Signed-off-by: Ryan QIAN --- diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index f7ffa373763c..5ac6c160b0a8 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1857,7 +1857,7 @@ CONFIG_DMA_ENGINE=y # CONFIG_DMATEST is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set -CONFIG_STAGING=y +# CONFIG_STAGING is not set # CONFIG_STAGING_EXCLUDE_BUILD is not set # CONFIG_USB_DABUSB is not set # CONFIG_USB_SE401 is not set @@ -1885,8 +1885,8 @@ CONFIG_STAGING=y # CONFIG_SMB_FS is not set # CONFIG_EASYCAP is not set CONFIG_MACH_NO_WESTBRIDGE=y -CONFIG_ATH6K_LEGACY=m -CONFIG_AR600x_SD31_XXX=y +# CONFIG_ATH6K_LEGACY is not set +# CONFIG_AR600x_SD31_XXX is not set # CONFIG_AR600x_WB31_XXX is not set # CONFIG_AR600x_SD32_XXX is not set # CONFIG_AR600x_CUSTOM_XXX is not set