summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-04-23 10:16:39 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-04-23 10:16:39 -0400
commit3a153ad929f8bdeceb6b37fefa9f48732fee1a41 (patch)
treed503014f93fed593f8aa3815b3327b18bf85738e /config-generic
parent0d59e0e8af8a60327898c9719e9e7b6970cfdcb2 (diff)
downloadkernel-3a153ad929f8bdeceb6b37fefa9f48732fee1a41.tar.gz
kernel-3a153ad929f8bdeceb6b37fefa9f48732fee1a41.tar.xz
kernel-3a153ad929f8bdeceb6b37fefa9f48732fee1a41.zip
Linux v4.0-10710-g27cf3a16b253
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index d14208325..9ec015755 100644
--- a/config-generic
+++ b/config-generic
@@ -266,6 +266,7 @@ CONFIG_MTD=m
# CONFIG_SM_FTL is not set
# CONFIG_MTD_OOPS is not set
# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_PARTITIONED_MASTER is not set
#
# RAM/ROM/Flash chip drivers
@@ -390,6 +391,7 @@ CONFIG_VIRTIO_BLK=m
CONFIG_VIRTIO_PCI=m
CONFIG_VIRTIO_PCI_LEGACY=y
CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
CONFIG_VIRTIO_MMIO=m
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_NET=m
@@ -2931,6 +2933,7 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_MEN_A21_WDT is not set
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_XILINX_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m