rpms/kernel/F-9 kernel.spec, 1.797, 1.798 linux-2.6-x86-sb450-skip-irq0-override-if-not-routed-to-INT2.patch, 1.1, 1.2

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
	linux-2.6-x86-sb450-skip-irq0-override-if-not-routed-to-INT2.patch 
Log Message:
Fix namespace clash in ATI timer patch.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -r1.797 -r1.798
--- kernel.spec	13 Oct 2008 20:24:14 -0000	1.797
+++ kernel.spec	13 Oct 2008 21:19:22 -0000	1.798
@@ -1936,6 +1936,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Oct 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.6-71
+- Fix namespace clash in ATI timer patch.
+
 * Mon Oct 13 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.6-70
 - x86, early_ioremap: fix fencepost error
 - x86: SB450: skip IRQ0 override if it is not routed to INT2 of IOAPIC

linux-2.6-x86-sb450-skip-irq0-override-if-not-routed-to-INT2.patch:

Index: linux-2.6-x86-sb450-skip-irq0-override-if-not-routed-to-INT2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-x86-sb450-skip-irq0-override-if-not-routed-to-INT2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-x86-sb450-skip-irq0-override-if-not-routed-to-INT2.patch	13 Oct 2008 20:24:14 -0000	1.1
+++ linux-2.6-x86-sb450-skip-irq0-override-if-not-routed-to-INT2.patch	13 Oct 2008 21:19:22 -0000	1.2
@@ -48,7 +48,7 @@
 +	return d;
 +}
 +
-+static void __init ati_bugs(int num, int slot, int func)
++static void __init ati_sb4xx_bugs(int num, int slot, int func)
 +{
 +#if defined(CONFIG_ACPI) && defined (CONFIG_X86_IO_APIC)
 +	u32 d;
@@ -84,7 +84,7 @@
  	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,
  	  PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config },
 +	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,
-+	  PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_bugs },
++	  PCI_CLASS_SERIAL_SMBUS, PCI_ANY_ID, 0, ati_sb4xx_bugs },
  	{}
  };