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 branch 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
arch
/
arm
/
include
/
asm
/
io.h
diff --git
a/arch/arm/include/asm/io.h
b/arch/arm/include/asm/io.h
index
7193485
..
a809445
100644
(file)
--- a/
arch/arm/include/asm/io.h
+++ b/
arch/arm/include/asm/io.h
@@
-60,10
+60,9
@@
extern void __raw_readsl(const void __iomem *addr, void *data, int longlen);
#define MT_DEVICE 0
#define MT_DEVICE_NONSHARED 1
#define MT_DEVICE_CACHED 2
#define MT_DEVICE 0
#define MT_DEVICE_NONSHARED 1
#define MT_DEVICE_CACHED 2
-#define MT_DEVICE_IXP2000 3
-#define MT_DEVICE_WC 4
+#define MT_DEVICE_WC 3
/*
/*
- * types
5
onwards can be found in asm/mach/map.h and are undefined
+ * types
4
onwards can be found in asm/mach/map.h and are undefined
* for ioremap
*/
* for ioremap
*/