diff options
author | root <root@rshg054.dnsready.net> | 2012-01-22 23:15:13 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-01-22 23:15:13 +0000 |
commit | 164067832916c8e59219e1b0f30d7d04618a536e (patch) | |
tree | 5ec718dc77dfccfcdb1409707658bef3fb421ac4 /libre/linux-libre/config.i686 | |
parent | a1922d0ec660fdc1892f2783515f781c090df0a9 (diff) |
Sun Jan 22 23:15:13 UTC 2012
Diffstat (limited to 'libre/linux-libre/config.i686')
-rw-r--r-- | libre/linux-libre/config.i686 | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 71783fa50..9aace04bc 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,10 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -<<<<<<< HEAD -# Linux/i386 3.1.6-1 Kernel Configuration -======= # Linux/i386 3.2.0 Kernel Configuration ->>>>>>> ddf6b4309b9f9816e75828359a2d60a23a0ca68c # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1297,7 +1293,8 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=y -CONFIG_CONNECTOR=m +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y CONFIG_MTD=m CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m @@ -2269,13 +2266,11 @@ CONFIG_CARL9170_WPC=y CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2294,7 +2289,10 @@ CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set -# CONFIG_BRCMFMAC is not set +CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +# CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set @@ -3318,11 +3316,7 @@ CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_DEBUG is not set +# CONFIG_BCMA is not set # # Multifunction device drivers |