projects
/
linux-flexiantxendom0-3.2.10.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (Andrew's patch-bomb)
[linux-flexiantxendom0-3.2.10.git]
/
arch
/
ia64
/
kernel
/
acpi.c
diff --git
a/arch/ia64/kernel/acpi.c
b/arch/ia64/kernel/acpi.c
index
19bb1ee
..
ac795d3
100644
(file)
--- a/
arch/ia64/kernel/acpi.c
+++ b/
arch/ia64/kernel/acpi.c
@@
-50,7
+50,6
@@
#include <asm/iosapic.h>
#include <asm/machvec.h>
#include <asm/page.h>
-#include <asm/system.h>
#include <asm/numa.h>
#include <asm/sal.h>
#include <asm/cyclone.h>