diff --git a/[refs] b/[refs] index c71fc6847cd7..e72177def91c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce45b51ac4c3c575c71ab5c91c29bf34c2af6f7d +refs/heads/master: 35729449655abcceeb3c72181e9920cf98f81c1e diff --git a/trunk/include/asm-ia64/acpi.h b/trunk/include/asm-ia64/acpi.h index 5d03792d4f65..5b526357d178 100644 --- a/trunk/include/asm-ia64/acpi.h +++ b/trunk/include/asm-ia64/acpi.h @@ -30,6 +30,8 @@ #ifdef __KERNEL__ +#include + #include #include #include @@ -119,11 +121,6 @@ extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS]; extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; #endif -/* - * Refer Intel ACPI _PDC support document for bit definitions - */ -#define ACPI_PDC_EST_CAPABILITY_SMP 0x8 - #endif /*__KERNEL__*/ #endif /*_ASM_ACPI_H*/