summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kmcmarti@redhat.com>2013-02-26 15:16:34 -0500
committerKyle McMartin <kmcmarti@redhat.com>2013-02-26 15:16:34 -0500
commit41df8b4a7d76dcf6322cdab3e33c860c804babfa (patch)
tree52c125c77f1867acb9776d8e90bb30c66198b222
parentab465cba10dd11d9e0e880686630a64b508c6587 (diff)
downloadkernel-41df8b4a7d76dcf6322cdab3e33c860c804babfa.tar.gz
kernel-41df8b4a7d76dcf6322cdab3e33c860c804babfa.tar.xz
kernel-41df8b4a7d76dcf6322cdab3e33c860c804babfa.zip
move vmxnet3 to config-x86-generic
-rw-r--r--config-generic1
-rw-r--r--config-x86-generic2
-rw-r--r--kernel.spec4
3 files changed, 6 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index ff71da52b..740844213 100644
--- a/config-generic
+++ b/config-generic
@@ -331,7 +331,6 @@ 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
CONFIG_VIRTIO_CONSOLE=y
CONFIG_VHOST_NET=m
diff --git a/config-x86-generic b/config-x86-generic
index b87adfe18..d6a0caecd 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -449,3 +449,5 @@ CONFIG_MODULE_SIG_SHA256=y
CONFIG_SYSTEM_BLACKLIST_KEYRING=y
CONFIG_MODULE_SIG_UEFI=y
+
+CONFIG_VMXNET3=m
diff --git a/kernel.spec b/kernel.spec
index df1d61cf9..a2baadee6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2302,6 +2302,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Feb 26 2013 Kyle McMartin <kmcmarti@redhat.com>
+- Move VMXNET3 to config-x86-generic from config-generic, it's VMware
+ virtual ethernet.
+
* Tue Feb 26 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc0.git8.1
- Linux v3.8-8664-gc41b381