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
/
include
/
asm
/
apic.h
diff --git
a/arch/x86/include/asm/apic.h
b/arch/x86/include/asm/apic.h
index
a279d98
..
2b7d573
100644
(file)
--- a/
arch/x86/include/asm/apic.h
+++ b/
arch/x86/include/asm/apic.h
@@
-2,7
+2,6
@@
#define _ASM_X86_APIC_H
#include <linux/cpumask.h>
-#include <linux/delay.h>
#include <linux/pm.h>
#include <asm/alternative.h>