summaryrefslogtreecommitdiffstats
path: root/config-x86-32-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-10 08:31:19 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-10 08:31:19 -0400
commit9b82ecdfb861cd3daf9d01b050c4937391aec003 (patch)
tree04c35507c2c3b5cabd7ba2fcb217af3e8285c129 /config-x86-32-generic
parent38d8cd2ec1088b1ea6afe3520826405f20e9adcb (diff)
downloadkernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.gz
kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.tar.xz
kernel-9b82ecdfb861cd3daf9d01b050c4937391aec003.zip
Update to Linux v3.15
Diffstat (limited to 'config-x86-32-generic')
-rw-r--r--config-x86-32-generic4
1 files changed, 1 insertions, 3 deletions
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 21fe6fe75..6adcfb524 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -115,9 +115,6 @@ CONFIG_PC8736x_GPIO=m
CONFIG_CS5535_GPIO=m
CONFIG_GPIO_SCH=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ES18XX=m
-
CONFIG_HW_RANDOM_GEODE=m
CONFIG_TC1100_WMI=m
@@ -232,5 +229,6 @@ CONFIG_BACKLIGHT_PWM=m
# CONFIG_PINCTRL_SINGLE is not set
# CONFIG_PINCTRL_CAPRI is not set
# CONFIG_PINCTRL_MSM8X74 is not set
+# CONFIG_PINCTRL_BCM281XX is not set
# CONFIG_COMMON_CLK_SI570 is not set
# CONFIG_COMMON_CLK_QCOM is not set