summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-11-12 13:22:52 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2013-11-12 14:24:29 -0500
commit713abc0c25d574380a3154b9c4d524ac2f5aab29 (patch)
tree972ea7d7258b7c6b59f788a7d59a3ecdcde135c5 /config-generic
parent6dfcb01411c8465cede72726b709b986754c3ed1 (diff)
downloadkernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.tar.gz
kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.tar.xz
kernel-713abc0c25d574380a3154b9c4d524ac2f5aab29.zip
Linux v3.12-4849-g10d0c97
Replace x86-allow-1024-cpus.patch with the patch that contains the one hunk not already applied upstream. Don't install the 'trace' alias symlink for 'perf trace'. Seems much too generic to just throw that into /usr/bin
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic6
1 files changed, 6 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 756791c9d..0c2eb994a 100644
--- a/config-generic
+++ b/config-generic
@@ -3338,6 +3338,7 @@ CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_SPEAKERS=m
CONFIG_SND_ISIGHT=m
CONFIG_SND_SCS1X=m
+CONFIG_SND_DICE=m
#
# Open Sound System
@@ -4558,6 +4559,7 @@ CONFIG_LEDS_DELL_NETBOOKS=m
# CONFIG_LEDS_PWM is not set
# CONFIG_LEDS_LP8501 is not set
# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_PCA9685 is not set
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_ONESHOT=m
@@ -4974,6 +4976,8 @@ CONFIG_GPIO_VIPERBOARD=m
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_BCM_KONA is not set
# FIXME: Why?
CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
@@ -5039,6 +5043,8 @@ CONFIG_FMC_CHARDEV=m
# CONFIG_HSI is not set
+# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
+
# CONFIG_PM_DEVFREQ is not set
# CONFIG_MODULE_SIG is not set
# CONFIG_SYSTEM_TRUSTED_KEYRING is not set