diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-15 23:53:24 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-15 23:53:24 -0400 |
| commit | eb133c8b1c796249cea42e3b17e03fccfaa8cfc6 (patch) | |
| tree | 43c33f10998af8ad485199638cfd0ddda7a98bd8 /kernels/linux-libre-pae/config | |
| parent | 0d890d258efd20d019024170fcb156ea4973d6c9 (diff) | |
| parent | d55def6a28adaf0688168e109c9793619fb691b2 (diff) | |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'kernels/linux-libre-pae/config')
| -rw-r--r-- | kernels/linux-libre-pae/config | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index e001d16eb..cc77645ce 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.11.0-1 Kernel Configuration +# Linux/x86 3.11.4-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1561,24 +1561,7 @@ CONFIG_MTD_BLOCK2MTD=m CONFIG_MTD_DOCG3=m CONFIG_BCH_CONST_M=14 CONFIG_BCH_CONST_T=4 -CONFIG_MTD_NAND_ECC=m -CONFIG_MTD_NAND_ECC_SMC=y -CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_ECC_BCH is not set -CONFIG_MTD_SM_COMMON=m -# CONFIG_MTD_NAND_DENALI is not set -CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_RICOH=m -CONFIG_MTD_NAND_DISKONCHIP=m -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -CONFIG_MTD_NAND_DOCG4=m -# CONFIG_MTD_NAND_CAFE is not set -CONFIG_MTD_NAND_CS553X=m -CONFIG_MTD_NAND_NANDSIM=m -# CONFIG_MTD_NAND_PLATFORM is not set -CONFIG_MTD_ALAUDA=m +# CONFIG_MTD_NAND is not set # CONFIG_MTD_ONENAND is not set # @@ -1753,7 +1736,7 @@ CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_SCAN_ASYNC=y # # SCSI Transports @@ -4845,9 +4828,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m # CONFIG_USB_DWC3 is not set -CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_UDC=y -# CONFIG_USB_CHIPIDEA_DEBUG is not set +# CONFIG_USB_CHIPIDEA is not set # # USB port drivers @@ -6404,7 +6385,6 @@ CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_ENC8=y CONFIG_REED_SOLOMON_DEC8=y -CONFIG_REED_SOLOMON_DEC16=y CONFIG_BCH=m CONFIG_BCH_CONST_PARAMS=y CONFIG_TEXTSEARCH=y |