From 3a153ad929f8bdeceb6b37fefa9f48732fee1a41 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Thu, 23 Apr 2015 10:16:39 -0400 Subject: Linux v4.0-10710-g27cf3a16b253 --- config-generic | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config-generic') 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 -- cgit