rpms/kernel/F-11 config-powerpc-generic, 1.43, 1.44 kernel.spec, 1.1757, 1.1758

[Ben Skeggs]

Author: bskeggs

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

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




Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/config-powerpc-generic,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- config-powerpc-generic	8 Sep 2009 17:02:44 -0000	1.43
+++ config-powerpc-generic	8 Oct 2009 05:54:43 -0000	1.44
@@ -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-11/kernel.spec,v
retrieving revision 1.1757
retrieving revision 1.1758
diff -u -p -r1.1757 -r1.1758
--- kernel.spec	7 Oct 2009 17:31:03 -0000	1.1757
+++ kernel.spec	8 Oct 2009 05:54:43 -0000	1.1758
@@ -2046,6 +2046,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 09 2009 Ben Skeggs <bskeggs at redhat.com>     2.6.30.9-79
+- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
+
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>       2.6.30.9-78
 - Disable IRQSOFF tracer. (Adds unnecessary overhead when unused)