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 'topic/cs423x-merge' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ep93xx
/
include
/
mach
/
hardware.h
diff --git
a/arch/arm/mach-ep93xx/include/mach/hardware.h
b/arch/arm/mach-ep93xx/include/mach/hardware.h
index 529807d182bf2c28a8b47350dec7c2eb942cb12d..2866297310b7c9e38f80a7992921481e7140d00b 100644
(file)
--- a/
arch/arm/mach-ep93xx/include/mach/hardware.h
+++ b/
arch/arm/mach-ep93xx/include/mach/hardware.h
@@
-10,7
+10,6
@@
#include "platform.h"
-#include "gesbc9312.h"
#include "ts72xx.h"
#endif