diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-25 04:38:18 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-25 04:38:18 +0400 |
| commit | 9059b454248a060ab39346c5d079f56089ab3868 (patch) | |
| tree | 5d5df323bd91613bd8ed643e7a197ef46dea91ff /include | |
| parent | 9539ce2253ab1b054e9b0daf0abe0fd4263e1820 (diff) | |
| parent | d57c4a38928ab2f71542046a9bae2932006b2523 (diff) | |
| download | linux-9059b454248a060ab39346c5d079f56089ab3868.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] acpi_get_sysname() should be __init
[IA64] Cleanup acpi header to reuse the generic _PDC defines
[IA64] Fix using uninitialized data in _PDC setup
[IA64] start_secondary() and smp_callin() should be __cpuinit
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/acpi.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-ia64/acpi.h b/include/asm-ia64/acpi.h index 5d03792d4f65..5b526357d178 100644 --- a/include/asm-ia64/acpi.h +++ b/include/asm-ia64/acpi.h @@ -30,6 +30,8 @@ #ifdef __KERNEL__ +#include <acpi/pdc_intel.h> + #include <linux/init.h> #include <linux/numa.h> #include <asm/system.h> @@ -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*/ |