diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-09-19 04:47:49 -0400 |
| commit | 044a500e46742d39d22f1781cfb64ba93b463e39 (patch) | |
| tree | b0313211ea7ba26b90c1083ade0e4c9f486b87db /arch/ia64/kernel/acpi.c | |
| parent | f6098cf449b81c14a51e48dd22ae47d03126a1de (diff) | |
| parent | 6c0741fbdee5bd0f8ed13ac287c4ab18e8ba7d83 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 28a4529fdd60..7e926471e4ec 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
| @@ -899,7 +899,7 @@ int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base) | |||
| 899 | if ((err = iosapic_init(phys_addr, gsi_base))) | 899 | if ((err = iosapic_init(phys_addr, gsi_base))) |
| 900 | return err; | 900 | return err; |
| 901 | 901 | ||
| 902 | #if CONFIG_ACPI_NUMA | 902 | #ifdef CONFIG_ACPI_NUMA |
| 903 | acpi_map_iosapic(handle, 0, NULL, NULL); | 903 | acpi_map_iosapic(handle, 0, NULL, NULL); |
| 904 | #endif /* CONFIG_ACPI_NUMA */ | 904 | #endif /* CONFIG_ACPI_NUMA */ |
| 905 | 905 | ||