rpms/kernel/devel kernel-2.6.spec, 1.3275, 1.3276 linux-2.6-highres-timers.patch, 1.2, 1.3

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25746

Modified Files:
	kernel-2.6.spec linux-2.6-highres-timers.patch 
Log Message:
* Fri Jul 06 2007 Dave Jones <davej at redhat.com>
- Don't force enable HPET on ICH7 & ICH8
  This seems to be broken.



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3275
retrieving revision 1.3276
diff -u -r1.3275 -r1.3276
--- kernel-2.6.spec	6 Jul 2007 14:55:01 -0000	1.3275
+++ kernel-2.6.spec	6 Jul 2007 17:15:36 -0000	1.3276
@@ -2047,6 +2047,10 @@
 
 %changelog
 * Fri Jul 06 2007 Dave Jones <davej at redhat.com>
+- Don't force enable HPET on ICH7 & ICH8
+  This seems to be broken.
+
+* Fri Jul 06 2007 Dave Jones <davej at redhat.com>
 - 2.6.22-rc7-git5
 
 * Thu Jul 05 2007 Dave Jones <davej at redhat.com>

linux-2.6-highres-timers.patch:

Index: linux-2.6-highres-timers.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-highres-timers.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-highres-timers.patch	4 Jul 2007 18:57:50 -0000	1.2
+++ linux-2.6-highres-timers.patch	6 Jul 2007 17:15:36 -0000	1.3
@@ -7339,12 +7339,12 @@
 +                         ich_force_enable_hpet);
 +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
 +                         ich_force_enable_hpet);
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
-+                         ich_force_enable_hpet);
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
-+                         ich_force_enable_hpet);
-+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_1,
-+                         ich_force_enable_hpet);
++//DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
++//                         ich_force_enable_hpet);
++//DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
++//                         ich_force_enable_hpet);
++//DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_1,
++//                         ich_force_enable_hpet);
 +
 +
 +static struct pci_dev *cached_dev;