diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/asm-ia64/acpi-ext.h | |
parent | Input: HIDDEV - make HIDIOCSREPORT wait IO completion (diff) | |
parent | [PATCH] md: fix BUG when raid10 rebuilds without enough drives (diff) | |
download | linux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz linux-d344c5e0856ad03278d8700b503762dbc8b86e12.zip |
Manual merge with Linus
Diffstat (limited to 'include/asm-ia64/acpi-ext.h')
-rw-r--r-- | include/asm-ia64/acpi-ext.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/acpi-ext.h b/include/asm-ia64/acpi-ext.h index 9271d74c64cc..56d2ddc97b30 100644 --- a/include/asm-ia64/acpi-ext.h +++ b/include/asm-ia64/acpi-ext.h @@ -11,6 +11,7 @@ #define _ASM_IA64_ACPI_EXT_H #include <linux/types.h> +#include <acpi/actypes.h> extern acpi_status hp_acpi_csr_space (acpi_handle, u64 *base, u64 *length); |