- /* According to Nvidia all timer overrides are bogus. Just ignore
- them all. */
- if (vendor == PCI_VENDOR_ID_NVIDIA) {
- acpi_skip_timer_override = 1;
+#ifdef CONFIG_ACPI
+ /* According to Nvidia all timer overrides are bogus unless HPET
+ is enabled. */
+ if (vendor == PCI_VENDOR_ID_NVIDIA) {
+ nvidia_hpet_detected = 0;
+ acpi_table_parse(ACPI_HPET, nvidia_hpet_check);
+ if (nvidia_hpet_detected == 0) {
+ acpi_skip_timer_override = 1;
+ }
+ }
+#endif
+ if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
+ timer_over_8254 = 0;
+ printk(KERN_INFO "ATI board detected. Disabling timer routing "
+ "over 8254.\n");