diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /include/asm-x86_64/acpi.h | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-x86_64/acpi.h')
| -rw-r--r-- | include/asm-x86_64/acpi.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86_64/acpi.h index 2c95a319c056..ed59aa4c6ff9 100644 --- a/include/asm-x86_64/acpi.h +++ b/include/asm-x86_64/acpi.h | |||
| @@ -155,8 +155,6 @@ extern void acpi_reserve_bootmem(void); | |||
| 155 | 155 | ||
| 156 | #endif /*CONFIG_ACPI_SLEEP*/ | 156 | #endif /*CONFIG_ACPI_SLEEP*/ |
| 157 | 157 | ||
| 158 | #define boot_cpu_physical_apicid boot_cpu_id | ||
| 159 | |||
| 160 | extern int acpi_disabled; | 158 | extern int acpi_disabled; |
| 161 | extern int acpi_pci_disabled; | 159 | extern int acpi_pci_disabled; |
| 162 | 160 | ||