git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
acpi
/
earlyquirk.c
diff --git
a/arch/i386/kernel/acpi/earlyquirk.c
b/arch/i386/kernel/acpi/earlyquirk.c
index
1649a17
..
2e3b643
100644
(file)
--- a/
arch/i386/kernel/acpi/earlyquirk.c
+++ b/
arch/i386/kernel/acpi/earlyquirk.c
@@
-5,34
+5,17
@@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/pci.h>
-#include <linux/acpi.h>
-
#include <asm/pci-direct.h>
#include <asm/acpi.h>
#include <asm/apic.h>
#include <asm/pci-direct.h>
#include <asm/acpi.h>
#include <asm/apic.h>
-#ifdef CONFIG_ACPI
-
-static int nvidia_hpet_detected __initdata;
-
-static int __init nvidia_hpet_check(unsigned long phys, unsigned long size)
-{
- nvidia_hpet_detected = 1;
- return 0;
-}
-#endif
-
static int __init check_bridge(int vendor, int device)
{
#ifdef CONFIG_ACPI
static int __init check_bridge(int vendor, int device)
{
#ifdef CONFIG_ACPI
- /* According to Nvidia all timer overrides are bogus
unless HPET
-
is enabled
. */
+ /* According to Nvidia all timer overrides are bogus
. Just ignore
+
them all
. */
if (vendor == PCI_VENDOR_ID_NVIDIA) {
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;
- }
+ acpi_skip_timer_override = 1;
}
#endif
if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
}
#endif
if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {