diff options
| author | Dave Jones <davej@redhat.com> | 2007-02-11 02:36:29 +0100 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-11 02:36:29 +0100 |
| commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
| tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /arch/i386/kernel/acpi/earlyquirk.c | |
| parent | [CPUFREQ] Longhaul - Separate frequency and voltage transition (diff) | |
| parent | libata: kill ATA_ENABLE_PATA (diff) | |
| download | linux-bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1.tar.xz linux-bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1.zip | |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/i386/kernel/acpi/earlyquirk.c')
| -rw-r--r-- | arch/i386/kernel/acpi/earlyquirk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c index 4b60af7f91dd..bf86f7662d8b 100644 --- a/arch/i386/kernel/acpi/earlyquirk.c +++ b/arch/i386/kernel/acpi/earlyquirk.c @@ -16,7 +16,7 @@ static int nvidia_hpet_detected __initdata; -static int __init nvidia_hpet_check(unsigned long phys, unsigned long size) +static int __init nvidia_hpet_check(struct acpi_table_header *header) { nvidia_hpet_detected = 1; return 0; @@ -30,7 +30,7 @@ static int __init check_bridge(int vendor, int device) is enabled. */ if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) { nvidia_hpet_detected = 0; - acpi_table_parse(ACPI_HPET, nvidia_hpet_check); + acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check); if (nvidia_hpet_detected == 0) { acpi_skip_timer_override = 1; printk(KERN_INFO "Nvidia board " |