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 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
mmap.c
diff --git
a/arch/arm/mm/mmap.c
b/arch/arm/mm/mmap.c
index
b0a9830
..
afe209e
100644
(file)
--- a/
arch/arm/mm/mmap.c
+++ b/
arch/arm/mm/mmap.c
@@
-31,7
+31,7
@@
arch_get_unmapped_area(struct file *filp, unsigned long addr,
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma;
unsigned long start_addr;
-#if
def CONFIG_CPU_V6
+#if
defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
unsigned int cache_type;
int do_align = 0, aliasing = 0;