git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../torvalds-2.6/
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
acpi
/
sleep.c
diff --git
a/arch/x86_64/kernel/acpi/sleep.c
b/arch/x86_64/kernel/acpi/sleep.c
index
148f6f7
..
867a0eb
100644
(file)
--- a/
arch/x86_64/kernel/acpi/sleep.c
+++ b/
arch/x86_64/kernel/acpi/sleep.c
@@
-34,7
+34,6
@@
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/bootmem.h>
-#include <linux/irq.h>
#include <linux/acpi.h>
#include <asm/mpspec.h>
#include <asm/io.h>