commit 15a58ed12142939d51076380e6e58af477ad96ec
author Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Fri Feb 02 19:48:22 2007 +0300
committer Len Brown <len.brown@intel.com> Fri Feb 02 21:14:29 2007 -0500
tree 193dbd4637b3c1cd5d976215cece37a95041e499
parent 5f3b1a8b6737b09ce5df4ec9fad4ad271aecb5fb

ACPICA: Remove duplicate table definitions (non-conflicting), cont

Signed-off-by: Len Brown <len.brown@intel.com>

arch/x86_64/kernel/early-quirks.c

diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c
index 49802f1..bd30d13 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86_64/kernel/early-quirks.c
@@ -32,7 +32,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;
@@ -53,7 +53,7 @@
 		return;
 
 	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 "