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 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
apic.c
diff --git
a/arch/x86_64/kernel/apic.c
b/arch/x86_64/kernel/apic.c
index
d198f7d
..
1b0e07b
100644
(file)
--- a/
arch/x86_64/kernel/apic.c
+++ b/
arch/x86_64/kernel/apic.c
@@
-19,7
+19,6
@@
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/bootmem.h>
-#include <linux/smp_lock.h>
#include <linux/interrupt.h>
#include <linux/mc146818rtc.h>
#include <linux/kernel_stat.h>