---

yaml --- r: 156496 b: refs/heads/master c: 165f5f6 h: refs/heads/master v: v3
git-mirror · Jul 30, 2009 · 56703cd · 56703cd
1 parent 8835c32
commit 56703cd
Show file tree

Hide file tree

Showing 27 changed files with 162 additions and 328 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 320145fac91955ee35a6af7e1c2b42388a17b3d8
+refs/heads/master: 165f5f64199f972a21f21effc125d89ed2488e58
diff --git a/trunk/Documentation/arm/memory.txt b/trunk/Documentation/arm/memory.txt
@@ -21,8 +21,6 @@ ffff8000	ffffffff	copy_user_page / clear_user_page use.
 				For SA11xx and Xscale, this is used to
 				setup a minicache mapping.
 
-ffff4000	ffffffff	cache aliasing on ARMv6 and later CPUs.
-
 ffff1000	ffff7fff	Reserved.
 				Platforms must not use this address range.
 

diff --git a/trunk/arch/arm/boot/compressed/misc.c b/trunk/arch/arm/boot/compressed/misc.c
@@ -29,6 +29,7 @@ unsigned int __machine_arch_type;
 
 static void putstr(const char *ptr);
 
+#include <linux/compiler.h>
 #include <mach/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC