diff options
author | Josh Boyer <jwboyer@redhat.com> | 2012-05-22 09:06:13 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2012-05-22 09:06:13 -0400 |
commit | 08132645ed4b18472c3e80a7e7a81411180bbff0 (patch) | |
tree | 0ddea44913a433ced5f3f7f660456fab6168a05f /config-generic | |
parent | 41100351c7c3e40686d99477bbec6c65262c1f81 (diff) | |
download | kernel-08132645ed4b18472c3e80a7e7a81411180bbff0.tar.gz kernel-08132645ed4b18472c3e80a7e7a81411180bbff0.tar.xz kernel-08132645ed4b18472c3e80a7e7a81411180bbff0.zip |
Linux v3.4-2580-g72c04af
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic index bec997d93..22e4c0015 100644 --- a/config-generic +++ b/config-generic @@ -164,6 +164,7 @@ CONFIG_MLX4_INFINIBAND=m CONFIG_INFINIBAND_NES=m # CONFIG_INFINIBAND_NES_DEBUG is not set CONFIG_INFINIBAND_QIB=m +# CONFIG_INFINIBAND_OCRDMA is not set # # Executable file formats @@ -326,6 +327,7 @@ CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_NET=m CONFIG_VMXNET3=m CONFIG_HW_RANDOM_VIRTIO=m |