diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/acpi/pdc_intel.h | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'include/acpi/pdc_intel.h')
| -rw-r--r-- | include/acpi/pdc_intel.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/acpi/pdc_intel.h b/include/acpi/pdc_intel.h index fd6730e4e567..91f4a12a99a1 100644 --- a/include/acpi/pdc_intel.h +++ b/include/acpi/pdc_intel.h | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #define ACPI_PDC_SMP_T_SWCOORD (0x0080) | 14 | #define ACPI_PDC_SMP_T_SWCOORD (0x0080) |
| 15 | #define ACPI_PDC_C_C1_FFH (0x0100) | 15 | #define ACPI_PDC_C_C1_FFH (0x0100) |
| 16 | 16 | ||
| 17 | |||
| 18 | #define ACPI_PDC_EST_CAPABILITY_SMP (ACPI_PDC_SMP_C1PT | \ | 17 | #define ACPI_PDC_EST_CAPABILITY_SMP (ACPI_PDC_SMP_C1PT | \ |
| 19 | ACPI_PDC_C_C1_HALT) | 18 | ACPI_PDC_C_C1_HALT) |
| 20 | 19 | ||
| @@ -25,5 +24,4 @@ | |||
| 25 | ACPI_PDC_SMP_C1PT | \ | 24 | ACPI_PDC_SMP_C1PT | \ |
| 26 | ACPI_PDC_C_C1_HALT) | 25 | ACPI_PDC_C_C1_HALT) |
| 27 | 26 | ||
| 28 | #endif /* __PDC_INTEL_H__ */ | 27 | #endif /* __PDC_INTEL_H__ */ |
| 29 | |||