From 645f8acb4387adc11d62e8200d10a5e73a66b013 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 1 Apr 2012 22:50:05 +0200
Subject: [PATCH] projects/Generic*: disable build and install of VMWare
 drivers, this fixes #362

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 projects/Generic/linux/linux.i386.conf     | 4 +---
 projects/Generic/options                   | 2 +-
 projects/Generic_OSS/linux/linux.i386.conf | 3 +--
 projects/Generic_OSS/options               | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index c4d5292435..fc77140232 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -2300,7 +2300,6 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=y
 CONFIG_DRM_KMS_HELPER=y
-CONFIG_DRM_TTM=y
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
 # CONFIG_DRM_RADEON is not set
@@ -2311,7 +2310,7 @@ CONFIG_DRM_I915_KMS=y
 # CONFIG_DRM_SIS is not set
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_VMWGFX=y
+# CONFIG_DRM_VMWGFX is not set
 # CONFIG_STUB_POULSBO is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -2329,7 +2328,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_SYS_FOPS is not set
 # CONFIG_FB_WMT_GE_ROPS is not set
-CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/projects/Generic/options b/projects/Generic/options
index 7b1b69e702..00408f2f05 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -219,7 +219,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
-  GRAPHIC_DRIVERS="fglrx i915 i965 nvidia vmware"
+  GRAPHIC_DRIVERS="fglrx i915 i965 nvidia"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="yes"
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index 2b3108b466..36af7a845c 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -2311,7 +2311,7 @@ CONFIG_DRM_I915_KMS=y
 # CONFIG_DRM_SIS is not set
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
-CONFIG_DRM_VMWGFX=y
+# CONFIG_DRM_VMWGFX is not set
 # CONFIG_STUB_POULSBO is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
@@ -2329,7 +2329,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 # CONFIG_FB_SYS_FOPS is not set
 # CONFIG_FB_WMT_GE_ROPS is not set
-CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 938ac6f7ad..ecf6d31b71 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -219,7 +219,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
-  GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau vmware"
+  GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
   VDPAU="no"