summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2017-03-24 08:10:53 -0700
committerLaura Abbott <labbott@fedoraproject.org>2017-03-24 08:10:53 -0700
commitd9590581bcb0712ca9647c38c55c9cdb02be2f67 (patch)
treed3b5c92799587b13f7a1220e516f6a9b48752fdc /baseconfig
parent7478b7e01f42ff452926ce915c895f515390a45d (diff)
downloadkernel-d9590581bcb0712ca9647c38c55c9cdb02be2f67.tar.gz
kernel-d9590581bcb0712ca9647c38c55c9cdb02be2f67.tar.xz
kernel-d9590581bcb0712ca9647c38c55c9cdb02be2f67.zip
Linux v4.11-rc3-161-gebe6482
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/CONFIG_SND_X861
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS2
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD1
-rw-r--r--baseconfig/x86/CONFIG_SND_X861
4 files changed, 3 insertions, 2 deletions
diff --git a/baseconfig/CONFIG_SND_X86 b/baseconfig/CONFIG_SND_X86
deleted file mode 100644
index 0c9c5435e..000000000
--- a/baseconfig/CONFIG_SND_X86
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_X86=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
index 163365765..f2dd7ea1f 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
+++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS
@@ -1 +1 @@
-CONFIG_TI_CPTS=m
+CONFIG_TI_CPTS=y
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
new file mode 100644
index 000000000..b81356e32
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_TI_CPTS_MOD
@@ -0,0 +1 @@
+CONFIG_TI_CPTS_MOD=m
diff --git a/baseconfig/x86/CONFIG_SND_X86 b/baseconfig/x86/CONFIG_SND_X86
new file mode 100644
index 000000000..310c61afc
--- /dev/null
+++ b/baseconfig/x86/CONFIG_SND_X86
@@ -0,0 +1 @@
+CONFIG_SND_X86=y