[APPLIED] [PATCH 1/2] UBUNTU: [Config] Disable CONFIG_DRM_VMWGFX (staging driver)

[Leann Ogasawara]

Applied to Maverick linux master.

Thanks,
Leann

On Fri, 2010-07-16 at 09:55 -0700, Leann Ogasawara wrote:
> >From b59255830522c349f7d9cba19f3ac1e5c6dd1223 Mon Sep 17 00:00:00 2001
> From: Leann Ogasawara <leann.ogasawara at canonical.com>
> Date: Fri, 16 Jul 2010 09:39:59 -0700
> Subject: [PATCH 1/2] UBUNTU: [Config] Disable CONFIG_DRM_VMWGFX (staging driver)
> 
> BugLink: http://bugs.launchpad.net/bugs/606139
> 
> Per a request form the VMware QA team, disable the vmwgfx driver in
> staging.  It's been noted that the vmwgfx driver in staging is not
> stable enough for use at the moment.  It's recommended this driver only
> be enabled when it has been promoted from staging into the official
> mainline tree.
> 
> Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
> ---
>  debian.master/config/config.common.ubuntu |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index fdee92e..5371253 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -1050,7 +1050,7 @@ CONFIG_DRM_SIS=m
>  CONFIG_DRM_TDFX=m
>  CONFIG_DRM_TTM=m
>  CONFIG_DRM_VIA=m
> -CONFIG_DRM_VMWGFX=m
> +# CONFIG_DRM_VMWGFX is not set
>  CONFIG_DS1682=m
>  CONFIG_DSCC4=m
>  CONFIG_DSCC4_PCISYNC=y
> -- 
> 1.7.0.4
> 
> 
> 
>