From 30a3098cab7d9a0941084735b04edf5fffd6dc89 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Fri, 27 Jan 2012 10:05:41 -0500
Subject: [PATCH] Linux 3.3-rc1-git4 (upstream
 74ea15d909b31158f9b63190a95b52bc05586d4b)

Enable the non-staging GMA500 driver (rhbz 785053)
---
 config-generic     | 5 +----
 config-x86-generic | 5 +++--
 kernel.spec        | 8 ++++++--
 sources            | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config-generic b/config-generic
index f9a8ee4d4..9d8082cd9 100644
--- a/config-generic
+++ b/config-generic
@@ -2410,10 +2410,7 @@ CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
-CONFIG_DRM_PSB=m
-# CONFIG_DRM_PSB_MRST is not set
-# CONFIG_DRM_PSB_MFLD is not set
-# CONFIG_DRM_PSB_CDV is not set
+# CONFIG_DRM_PSB is not set
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_VMWGFX=m
diff --git a/config-x86-generic b/config-x86-generic
index d3fe36502..6a7d1f767 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -396,8 +396,9 @@ CONFIG_RELOCATABLE=y
 # Depends on HOTPLUG_PCI_PCIE
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 
-# Figure out how this relates to DRM_PSB in staging because confused
-# CONFIG_DRM_GMA500 is not set
+CONFIG_DRM_GMA500=m
+# CONFIG_DRM_GMA600 is not set
+# CONFIG_DRM_GMA3600 is not set
 
 # Maybe enable in debug kernels?
 # CONFIG_DEBUG_NMI_SELFTEST is not set
diff --git a/kernel.spec b/kernel.spec
index 5f324c66e..16b626be5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -87,7 +87,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2272,6 +2272,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jan 27 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc1.git4.1
+- Linux 3.3-rc1-git4 (upstream 74ea15d909b31158f9b63190a95b52bc05586d4b)
+- Enable the non-staging GMA500 driver (rhbz 785053)
+
 * Thu Jan 26 2012 Josh Boyer <jwboyer@redhat.com>
 - Drop revert-efi-rtclock.patch.  Issue was fixed by upstream commit 47997d75
 - Enable CONFIG_EFI_STUB per Matthew Garrett
diff --git a/sources b/sources
index e8fc2463e..f19110cc5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 364066fa18767ec0ae5f4e4abcf9dc51  linux-3.2.tar.xz
 2fed18362598429cc0669c01123290ff  compat-wireless-2012-01-09.tar.bz2
 1c3dd34fa219420a4cbed1e573d253e7  patch-3.3-rc1.xz
-99d600ef77eb7cf2a339435386e2a3f0  patch-3.3-rc1-git3.xz
+80d8de110a0f2acee8b2062c2422e5ce  patch-3.3-rc1-git4.xz