summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-12-13 11:00:37 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-12-13 11:00:37 -0500
commit4a6707e4c9afa1757e101877121ea6a4c3456117 (patch)
treecbb600df7a7dfaffe8d1f754b725dea47252232d
parentd496e06781739677e02de7853faf91fd5df96332 (diff)
downloadkernel-4a6707e4c9afa1757e101877121ea6a4c3456117.tar.gz
kernel-4a6707e4c9afa1757e101877121ea6a4c3456117.tar.xz
kernel-4a6707e4c9afa1757e101877121ea6a4c3456117.zip
Remove extraneous settings and enable Radeon KMS for powerpc (via Will Woods)
-rw-r--r--config-powerpc-generic6
-rw-r--r--kernel.spec1
2 files changed, 1 insertions, 6 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 8b2f35120..2ca0c3e83 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -38,15 +38,11 @@ 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
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_MB862XX_PCI_GDC is not set
# CONFIG_FB_MB862XX_LIME is not set
@@ -278,8 +274,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 8a8015182..909982663 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2231,6 +2231,7 @@ fi
%changelog
* Tue Dec 13 2011 Josh Boyer <jwboyer@redhat.com>
- mod-extras: Don't fail the build if a module is listed that isn't built
+- Remove extraneous settings and enable Radeon KMS for powerpc (via Will Woods)
* Mon Dec 12 2011 John W. Linville <linville@redhat.com>
- Turn-off backports until TAINT_OOT_MODULE issue is resolved