git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-spear6xx
/
spear6xx.c
diff --git
a/arch/arm/mach-spear6xx/spear6xx.c
b/arch/arm/mach-spear6xx/spear6xx.c
index b67e571d4bf7956813bef9bef7f1d9adb30f29da..baf6bcc3169c6f0f9ff817ca374e0dcd05eee0b9 100644
(file)
--- a/
arch/arm/mach-spear6xx/spear6xx.c
+++ b/
arch/arm/mach-spear6xx/spear6xx.c
@@
-13,7
+13,6
@@
#include <linux/types.h>
#include <linux/amba/pl061.h>
-#include <linux/types.h>
#include <linux/ptrace.h>
#include <linux/io.h>
#include <asm/hardware/vic.h>