rpms/kernel/devel config-powerpc-generic, 1.51, 1.52 kernel.spec, 1.1816, 1.1817

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2064

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/devel/config-powerpc-generic,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- config-powerpc-generic	28 Sep 2009 22:57:22 -0000	1.51
+++ config-powerpc-generic	8 Oct 2009 05:58:45 -0000	1.52
@@ -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/devel/kernel.spec,v
retrieving revision 1.1816
retrieving revision 1.1817
diff -u -p -r1.1816 -r1.1817
--- kernel.spec	7 Oct 2009 17:28:16 -0000	1.1816
+++ kernel.spec	8 Oct 2009 05:58:46 -0000	1.1817
@@ -1985,6 +1985,9 @@ fi
 # ##############################################################
 
 %changelog
+* Thu Oct 08 2009 Ben Skeggs <bskeggs at redhat.com>
+- ppc: compile nvidiafb as a module only, nvidiafb+nouveau = bang! (rh#491308)
+
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
 - Enable FUNCTION_GRAPH_TRACER on x86-64.