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 'master' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
include
/
mach
/
ts72xx.h
diff --git
a/arch/arm/mach-ep93xx/include/mach/ts72xx.h
b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
index 411734422c1dd138c7743be759c8088533088436..3bd934e9a7f1b8df9a2bbdb6e7753edfd0532af8 100644
(file)
--- a/
arch/arm/mach-ep93xx/include/mach/ts72xx.h
+++ b/
arch/arm/mach-ep93xx/include/mach/ts72xx.h
@@
-67,7
+67,6
@@
#ifndef __ASSEMBLY__
-#include <linux/io.h>
static inline int board_is_ts7200(void)
{
git.samba.org / sfrench / cifs-2.6.git / blobdiff