Merge intel.com:/home/lenb/src/26-stable-dev

into intel.com:/home/lenb/src/26-latest-dev

Merge intel.com:/home/lenb/src/26-stable-dev
into intel.com:/home/lenb/src/26-latest-dev
112e959c · Len Brown · d5d4cbf8 · e40a6a14 · 112e959c
Commit 112e959c authored Dec 20, 2004 by Len Brown
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

include/asm-i386/acpi.h include/asm-i386/acpi.h +0 -6

No files found.
--- a/include/asm-i386/acpi.h
+++ b/include/asm-i386/acpi.h
@@ -107,12 +107,6 @@ __acpi_release_global_lock (unsigned int *lock)
 #define ACPI_PDC_EST_CAPABILITY_SMP 	0xa
 #define ACPI_PDC_EST_CAPABILITY_MSR	0x1
-/*
- * Refer Intel ACPI _PDC support document for bit definitions
- */
-#define ACPI_PDC_EST_CAPABILITY_SMP 	0xa
-#define ACPI_PDC_EST_CAPABILITY_MSR	0x1
 #ifdef CONFIG_ACPI_BOOT 
 extern int acpi_lapic;
 extern int acpi_ioapic;