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 git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
dm365.c
diff --git
a/arch/arm/mach-davinci/dm365.c
b/arch/arm/mach-davinci/dm365.c
index
6b6f4c6
..
7781e35
100644
(file)
--- a/
arch/arm/mach-davinci/dm365.c
+++ b/
arch/arm/mach-davinci/dm365.c
@@
-969,8
+969,7
@@
static struct map_desc dm365_io_desc[] = {
.virtual = SRAM_VIRT,
.pfn = __phys_to_pfn(0x00010000),
.length = SZ_32K,
.virtual = SRAM_VIRT,
.pfn = __phys_to_pfn(0x00010000),
.length = SZ_32K,
- /* MT_MEMORY_NONCACHED requires supersection alignment */
- .type = MT_DEVICE,
+ .type = MT_MEMORY_NONCACHED,
},
};
},
};