git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
include
/
asm
/
acpi-ext.h
diff --git
a/arch/ia64/include/asm/acpi-ext.h
b/arch/ia64/include/asm/acpi-ext.h
index 734d137dda6ecb22f1f58c9cc09f6925fe605e03..7f8362b379eb9f5661829de36ca93c38a76d0388 100644
(file)
--- a/
arch/ia64/include/asm/acpi-ext.h
+++ b/
arch/ia64/include/asm/acpi-ext.h
@@
-14,7
+14,6
@@
#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);