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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
i386
/
kernel
/
tsc.c
diff --git
a/arch/i386/kernel/tsc.c
b/arch/i386/kernel/tsc.c
index
9810c8c
..
1bbe45d
100644
(file)
--- a/
arch/i386/kernel/tsc.c
+++ b/
arch/i386/kernel/tsc.c
@@
-13,7
+13,6
@@
#include <asm/delay.h>
#include <asm/tsc.h>
-#include <asm/delay.h>
#include <asm/io.h>
#include "mach_timer.h"