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 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into...
[pandora-kernel.git]
/
drivers
/
char
/
uv_mmtimer.c
diff --git
a/drivers/char/uv_mmtimer.c
b/drivers/char/uv_mmtimer.c
index
493b47a
..
956ebe2
100644
(file)
--- a/
drivers/char/uv_mmtimer.c
+++ b/
drivers/char/uv_mmtimer.c
@@
-23,7
+23,6
@@
#include <linux/interrupt.h>
#include <linux/time.h>
#include <linux/math64.h>
-#include <linux/smp_lock.h>
#include <asm/genapic.h>
#include <asm/uv/uv_hub.h>