diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-07 11:29:43 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-07 11:29:43 -0700 |
| commit | 2bfe94905d3601774c6418c020ba830c118578b4 (patch) | |
| tree | 49f908df283332371b74c4686dd2f0109db2bc61 /include | |
| parent | 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 (diff) | |
| parent | 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/sigcontext.h | 2 | ||||
| -rw-r--r-- | include/linux/acpi.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc/sigcontext.h b/include/asm-ppc/sigcontext.h index f82dcccdee1..b7a417e0a92 100644 --- a/include/asm-ppc/sigcontext.h +++ b/include/asm-ppc/sigcontext.h @@ -2,7 +2,7 @@ #define _ASM_PPC_SIGCONTEXT_H #include <asm/ptrace.h> - +#include <linux/compiler.h> struct sigcontext { unsigned long _unused[4]; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d5a55bdb9c3..b123cc08773 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -25,6 +25,8 @@ #ifndef _LINUX_ACPI_H #define _LINUX_ACPI_H +#include <linux/config.h> + #ifdef CONFIG_ACPI #ifndef _LINUX |