rpms/kernel/F-12 config-powerpc-generic, 1.49, 1.50 kernel.spec, 1.1851, 1.1852

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1209

Modified Files:
	config-powerpc-generic kernel.spec 
Log Message:
* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)



Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-powerpc-generic,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- config-powerpc-generic	1 Aug 2009 11:33:42 -0000	1.49
+++ config-powerpc-generic	8 Oct 2009 05:56:22 -0000	1.50
@@ -55,7 +55,7 @@ CONFIG_FB_OF=y
 CONFIG_FB_IBM_GXT4500=y
 CONFIG_FB_RADEON=y
 CONFIG_FB_MATROX=y
-CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA=m
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_ATY128_BACKLIGHT=y
 CONFIG_FB_ATY_BACKLIGHT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1851
retrieving revision 1.1852
diff -u -p -r1.1851 -r1.1852
--- kernel.spec	8 Oct 2009 04:42:12 -0000	1.1851
+++ kernel.spec	8 Oct 2009 05:56:22 -0000	1.1852
@@ -2079,6 +2079,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
+- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
+
 * Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.31.1-65
 - nouveau: {drm-next,context,fbcon,misc} fixes, connector forcing