summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-07-08 14:59:04 -0500
committerJustin M. Forbes <jforbes@redhat.com>2013-07-08 14:59:04 -0500
commit692b701d08508db129e14bf11fa38effa1a96b85 (patch)
tree5532951dfd752d8bfb56b9b59ec7d915555b8394 /config-arm-generic
parent333a655d5447c1d66f091051f2024e6a18d2246a (diff)
downloadkernel-692b701d08508db129e14bf11fa38effa1a96b85.tar.gz
kernel-692b701d08508db129e14bf11fa38effa1a96b85.tar.xz
kernel-692b701d08508db129e14bf11fa38effa1a96b85.zip
Linux v3.10-6005-gd2b4a64
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic4
1 files changed, 4 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index efce65434..e00b2501d 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -5,6 +5,7 @@ CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_GIC=y
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
# CONFIG_COMMON_CLK_DEBUG is not set
CONFIG_COMMON_CLK=y
CONFIG_DMA_OF=y
@@ -39,5 +40,8 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIO_OLPC_APSP=m
# CONFIG_CRYPTO_TEST is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_XEN is not set