[kernel/f16] Remove extraneous settings and enable Radeon KMS for powerpc (via Will Woods)

[Josh Boyer]

commit c63c5b8281a254df63fbbb83f8071e4dedee9f02
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Tue Dec 13 11:00:37 2011 -0500

    Remove extraneous settings and enable Radeon KMS for powerpc (via Will Woods)

 config-powerpc-generic |    7 -------
 kernel.spec            |    5 ++++-
 2 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/config-powerpc-generic b/config-powerpc-generic
index ec2ff7c..5ecaf0e 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -38,22 +38,17 @@ CONFIG_AGP_UNINORTH=y
 CONFIG_FB_OF=y
 # CONFIG_FB_CONTROL is not set
 CONFIG_FB_IBM_GXT4500=y
-CONFIG_FB_RADEON=y
 CONFIG_FB_MATROX=y
-CONFIG_FB_NVIDIA=m
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_RADEON_BACKLIGHT=y
 CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_NVIDIA_BACKLIGHT=y
 # FIXME: Do we care about this hardware ?
 CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
 CONFIG_FB_MB862XX_LIME=y
 CONFIG_FB_MB862XX_I2C=y
 
-
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 CONFIG_SND_AOA=m
@@ -278,8 +273,6 @@ CONFIG_GPIO_PCF857X=m
 # CONFIG_USB_FHCI_HCD is not set
 # CONFIG_FHCI_DEBUG is not set
 
-# CONFIG_DRM_RADEON_KMS is not set
-
 # CONFIG_AMIGAONE is not set
 
 CONFIG_PPC_OF_BOOT_TRAMPOLINE=y
diff --git a/kernel.spec b/kernel.spec
index 558ce90..7ee0504 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 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2208,6 +2208,9 @@ fi
 # and build.
 
 %changelog
+* Tue Dec 13 2011 Josh Boyer <jwboyer at redhat.com>
+- Remove extraneous settings and enable Radeon KMS for powerpc (via Will Woods)
+
 * Mon Dec 12 2011 Josh Boyer <jwboyer at redhat.com>
 - Add patch from Jeff Layton to fix suspend with NFS (rhbz #717735)
 - Backport ALPS touchpad patches from input/next branch (rhbz #590880)