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/hda-gateway' into topic/hda
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-iop33x
/
include
/
mach
/
io.h
diff --git
a/arch/arm/mach-iop33x/include/mach/io.h
b/arch/arm/mach-iop33x/include/mach/io.h
index 158874631217b0d7687c566de199ef9ddcce89ca..e99a7ed6d0502e0390ccb9f0e4de0c2f7890ba2c 100644
(file)
--- a/
arch/arm/mach-iop33x/include/mach/io.h
+++ b/
arch/arm/mach-iop33x/include/mach/io.h
@@
-11,7
+11,7
@@
#ifndef __IO_H
#define __IO_H
-#include <
mach/hardware
.h>
+#include <
asm/hardware/iop3xx
.h>
extern void __iomem *__iop3xx_ioremap(unsigned long cookie, size_t size,
unsigned int mtype);