summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Eriksson2016-04-25 12:29:28 +0200
committerMikael Eriksson2016-04-25 12:29:28 +0200
commitbc0cf4e15f5adc448e9cd21b6ce06fed3c68057b (patch)
treea14227d8024f196ef5fff0ed0f845b2525983b29
parent776c662b98943092880ac7d378d3e25bd41758c5 (diff)
downloadaur-bc0cf4e15f5adc448e9cd21b6ce06fed3c68057b.tar.gz
Imported configs from 4.5.2-1
-rw-r--r--.SRCINFO2
-rw-r--r--config10
-rw-r--r--config.x86_647
3 files changed, 13 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0c94c9197451..110cbdd5f87e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Apr 18 08:33:37 UTC 2016
+# Mon Apr 25 10:29:28 UTC 2016
pkgbase = linux-mainline
pkgver = 4.6rc4
pkgrel = 1
diff --git a/config b/config
index af9d6341c2d2..b43a1786ab7b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.5.0 Kernel Configuration
+# Linux/x86 4.5.2-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -5440,6 +5440,9 @@ CONFIG_SND_SST_IPC_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_SST_ACPI=m
CONFIG_SND_SOC_INTEL_SST_MATCH=m
+CONFIG_SND_SOC_INTEL_HASWELL=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
@@ -5448,7 +5451,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
CONFIG_SND_SOC_INTEL_SKYLAKE=m
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
-CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
#
# Allwinner SoC Audio support
@@ -5484,6 +5487,7 @@ CONFIG_SND_SOC_DMIC=m
# CONFIG_SND_SOC_GTM601 is not set
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
# CONFIG_SND_SOC_PCM1681 is not set
# CONFIG_SND_SOC_PCM179X is not set
# CONFIG_SND_SOC_PCM3168A_I2C is not set
@@ -6239,7 +6243,7 @@ CONFIG_FSL_EDMA=m
CONFIG_INTEL_IDMA64=m
CONFIG_PCH_DMA=m
CONFIG_DW_DMAC_CORE=y
-CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC=y
CONFIG_DW_DMAC_PCI=m
CONFIG_HSU_DMA=y
diff --git a/config.x86_64 b/config.x86_64
index c1077673d3fb..6a7312f549d8 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.5.0 Kernel Configuration
+# Linux/x86 4.5.2-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -5226,6 +5226,9 @@ CONFIG_SND_SST_IPC_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_SST_ACPI=m
CONFIG_SND_SOC_INTEL_SST_MATCH=m
+CONFIG_SND_SOC_INTEL_HASWELL=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
@@ -6009,7 +6012,7 @@ CONFIG_INTEL_IDMA64=m
CONFIG_INTEL_IOATDMA=m
CONFIG_INTEL_MIC_X100_DMA=m
CONFIG_DW_DMAC_CORE=y
-CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC=y
CONFIG_DW_DMAC_PCI=m
CONFIG_HSU_DMA=y