summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx6_defconfig
diff options
context:
space:
mode:
authorRyan QIAN <b32804@freescale.com>2011-12-08 13:38:33 +0800
committerJason Liu <r64343@freescale.com>2012-01-09 21:09:40 +0800
commit145493838e4f5518798db048ac3b95311f433460 (patch)
tree3723d20762bfa50b4d2b8205cdb1a4459f19b61a /arch/arm/configs/imx6_defconfig
parenta7137e89683fd0a6d801f4f9cee8bb9f90d843b1 (diff)
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 <b32804@freescale.com>
Diffstat (limited to 'arch/arm/configs/imx6_defconfig')
-rw-r--r--arch/arm/configs/imx6_defconfig6
1 files changed, 3 insertions, 3 deletions
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