diff options
| author | Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> | 2007-02-02 11:48:22 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:29 -0500 |
| commit | 15a58ed12142939d51076380e6e58af477ad96ec (patch) | |
| tree | 193dbd4637b3c1cd5d976215cece37a95041e499 /arch/x86_64/kernel/early-quirks.c | |
| parent | 5f3b1a8b6737b09ce5df4ec9fad4ad271aecb5fb (diff) | |
ACPICA: Remove duplicate table definitions (non-conflicting), cont
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86_64/kernel/early-quirks.c')
| -rw-r--r-- | arch/x86_64/kernel/early-quirks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86_64/kernel/early-quirks.c index 49802f1bee94..bd30d138113f 100644 --- a/arch/x86_64/kernel/early-quirks.c +++ b/arch/x86_64/kernel/early-quirks.c | |||
| @@ -32,7 +32,7 @@ static void via_bugs(void) | |||
| 32 | 32 | ||
| 33 | static int nvidia_hpet_detected __initdata; | 33 | static int nvidia_hpet_detected __initdata; |
| 34 | 34 | ||
| 35 | static int __init nvidia_hpet_check(unsigned long phys, unsigned long size) | 35 | static int __init nvidia_hpet_check(struct acpi_table_header *header) |
| 36 | { | 36 | { |
| 37 | nvidia_hpet_detected = 1; | 37 | nvidia_hpet_detected = 1; |
| 38 | return 0; | 38 | return 0; |
| @@ -53,7 +53,7 @@ static void nvidia_bugs(void) | |||
| 53 | return; | 53 | return; |
| 54 | 54 | ||
| 55 | nvidia_hpet_detected = 0; | 55 | nvidia_hpet_detected = 0; |
| 56 | acpi_table_parse(ACPI_HPET, nvidia_hpet_check); | 56 | acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check); |
| 57 | if (nvidia_hpet_detected == 0) { | 57 | if (nvidia_hpet_detected == 0) { |
| 58 | acpi_skip_timer_override = 1; | 58 | acpi_skip_timer_override = 1; |
| 59 | printk(KERN_INFO "Nvidia board " | 59 | printk(KERN_INFO "Nvidia board " |