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 - 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 - Turn-off backports until TAINT_OOT_MODULE issue is resolved