rpms/kernel/F-12 Makefile, 1.110, 1.111 config-generic, 1.328, 1.329 kernel.spec, 1.1880, 1.1881

[Dave Airlie]

Author: airlied

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

Modified Files:
	Makefile config-generic kernel.spec 
Log Message:
* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com. 2.6.31.5-95
- re enable MSI



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/Makefile,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- Makefile	14 Oct 2009 00:12:13 -0000	1.110
+++ Makefile	23 Oct 2009 21:29:18 -0000	1.111
@@ -73,7 +73,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_DMA_API_DEBUG is not set/CONFIG_DMA_API_DEBUG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_PM_TEST_SUSPEND is not set/CONFIG_PM_TEST_SUSPEND=y/' config-generic
 	@perl -pi -e 's/# CONFIG_BOOT_TRACER is not set/CONFIG_BOOT_TRACER=y/' config-generic
-	@perl -pi -e 's/# CONFIG_PCI_MSI_DEFAULT_ON is not set/CONFIG_PCI_MSI_DEFAULT_ON=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43_DEBUG is not set/CONFIG_B43_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/config-generic,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -p -r1.328 -r1.329
--- config-generic	23 Oct 2009 21:07:59 -0000	1.328
+++ config-generic	23 Oct 2009 21:29:18 -0000	1.329
@@ -81,7 +81,7 @@ CONFIG_PCI_STUB=y
 CONFIG_PCI_IOV=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_MSI=y
-# CONFIG_PCI_MSI_DEFAULT_ON is not set
+CONFIG_PCI_MSI_DEFAULT_ON=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1880
retrieving revision 1.1881
diff -u -p -r1.1880 -r1.1881
--- kernel.spec	23 Oct 2009 21:08:00 -0000	1.1880
+++ kernel.spec	23 Oct 2009 21:29:18 -0000	1.1881
@@ -2084,6 +2084,9 @@ fi
 # and build.
 
 %changelog
+* Fri Oct 23 2009 Dave Airlie <airlied at redhat.com. 2.6.31.5-95
+- re enable MSI
+
 * Fri Oct 23 2009 Dave Airlie <airlied at redhat.com> 2.6.31.5-94
 - disable debug + stackprotector