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 branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
irq.c
diff --git
a/arch/x86/kernel/irq.c
b/arch/x86/kernel/irq.c
index
948a31e
..
1cb0b9f
100644
(file)
--- a/
arch/x86/kernel/irq.c
+++ b/
arch/x86/kernel/irq.c
@@
-8,6
+8,7
@@
#include <linux/seq_file.h>
#include <linux/smp.h>
#include <linux/ftrace.h>
+#include <linux/delay.h>
#include <asm/apic.h>
#include <asm/io_apic.h>