From: Ashok Vairavan <ashok.vairavan@oracle.com>
Date: Wed, 9 Nov 2016 21:12:16 +0000 (-0800)
Subject: uek-rpm nano: Remove vmware modules from UEK Nano
X-Git-Tag: v4.1.12-92~33^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dd11a2c5a01bd512583432c3dec6269ddb1532c1;p=users%2Fjedix%2Flinux-maple.git

uek-rpm nano: Remove vmware modules from UEK Nano

Orabug:24808621
Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
---

diff --git a/uek-rpm/ol6-nano/config-x86_64 b/uek-rpm/ol6-nano/config-x86_64
index 78a711bab8e01..40326163f60d6 100644
--- a/uek-rpm/ol6-nano/config-x86_64
+++ b/uek-rpm/ol6-nano/config-x86_64
@@ -1374,7 +1374,6 @@ CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
@@ -1681,7 +1680,7 @@ CONFIG_ENCLOSURE_SERVICES=m
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
-CONFIG_VMWARE_BALLOON=m
+# CONFIG_VMWARE_BALLOON is not set
 # CONFIG_BMP085_I2C is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_SRAM is not set
@@ -1711,7 +1710,7 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # CONFIG_INTEL_MEI is not set
 # CONFIG_INTEL_MEI_ME is not set
 # CONFIG_INTEL_MEI_TXE is not set
-CONFIG_VMWARE_VMCI=m
+# CONFIG_VMWARE_VMCI is not set
 
 #
 # Intel MIC Bus Driver
@@ -1810,7 +1809,7 @@ CONFIG_SCSI_MPT2SAS=m
 # CONFIG_SCSI_UFSHCD is not set
 CONFIG_SCSI_HPTIOP=m
 # CONFIG_SCSI_BUSLOGIC is not set
-CONFIG_VMWARE_PVSCSI=m
+# CONFIG_VMWARE_PVSCSI is not set
 CONFIG_XEN_SCSI_FRONTEND=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
@@ -2309,7 +2308,7 @@ CONFIG_PCMCIA_RAYCS=y
 # CONFIG_IEEE802154_DRIVERS is not set
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
+# CONFIG_VMXNET3 is not set
 CONFIG_HYPERV_NET=m
 # CONFIG_ISDN is not set
 
diff --git a/uek-rpm/ol6-nano/config-x86_64-debug b/uek-rpm/ol6-nano/config-x86_64-debug
index a8b0b701d83fa..01162590536d2 100644
--- a/uek-rpm/ol6-nano/config-x86_64-debug
+++ b/uek-rpm/ol6-nano/config-x86_64-debug
@@ -1405,7 +1405,6 @@ CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_VSOCKETS=m
-CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
@@ -1758,7 +1757,7 @@ CONFIG_ENCLOSURE_SERVICES=m
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_DS1682 is not set
-CONFIG_VMWARE_BALLOON=m
+# CONFIG_VMWARE_BALLOON is not set
 # CONFIG_BMP085_I2C is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_SRAM is not set
@@ -1788,7 +1787,8 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # CONFIG_INTEL_MEI is not set
 # CONFIG_INTEL_MEI_ME is not set
 # CONFIG_INTEL_MEI_TXE is not set
-CONFIG_VMWARE_VMCI=m
+# CONFIG_VMWARE_VMCI is not set
+
 
 #
 # Intel MIC Bus Driver
@@ -1895,7 +1895,7 @@ CONFIG_SCSI_MPT3SAS_LOGGING=y
 # CONFIG_SCSI_UFSHCD is not set
 CONFIG_SCSI_HPTIOP=m
 # CONFIG_SCSI_BUSLOGIC is not set
-CONFIG_VMWARE_PVSCSI=m
+# CONFIG_VMWARE_PVSCSI is not set
 CONFIG_XEN_SCSI_FRONTEND=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_LIBFC=m
@@ -2476,7 +2476,7 @@ CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_HYPERV_NET is not set
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
+
 CONFIG_HYPERV_NET=m
 # CONFIG_ISDN is not set