summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-03 08:27:34 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-03 13:32:30 -0400
commitdeb816ab2a9e56c61f86b5fd641185ea2fd4fbc0 (patch)
treeb3c6f07375b0eedf0f6a790c4d678ba8a02b600e /config-generic
parent94a5a8a2cbbfd22a31cb68d52661ad80ec9d2bb2 (diff)
downloadkernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.gz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.xz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.zip
Linux v3.9-8933-gce85722
- First DRM merge
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 075f207e9..db33c9ce3 100644
--- a/config-generic
+++ b/config-generic
@@ -339,6 +339,7 @@ CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_VIRTIO_CONSOLE=y
CONFIG_VHOST_NET=m
CONFIG_TCM_VHOST=m
+CONFIG_VHOST_SCSI=m
#
# SCSI device support
@@ -4072,6 +4073,7 @@ CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_CMAC=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_LRW=m