---

yaml --- r: 156507 b: refs/heads/master c: fb38500 h: refs/heads/master i: 156505: f93d174 156503: bb4f5b4 v: v3
git-mirror · Aug 8, 2009 · 6e4d146 · 6e4d146
1 parent 921c4e3
commit 6e4d146
Show file tree

Hide file tree

Showing 99 changed files with 961 additions and 709 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b36ec0428a06fcbdb67d61e9e664154e5dd9a8c7
+refs/heads/master: fb385003c4ac9634cf2448f6ded81e5fd1190c1f
diff --git a/trunk/Documentation/arm/memory.txt b/trunk/Documentation/arm/memory.txt
@@ -21,6 +21,8 @@ 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,7 +29,6 @@ unsigned int __machine_arch_type;
 
 static void putstr(const char *ptr);
 
-#include <linux/compiler.h>
 #include <mach/uncompress.h>
 
 #ifdef CONFIG_DEBUG_ICEDCC

diff --git a/trunk/arch/arm/common/clkdev.c b/trunk/arch/arm/common/clkdev.c
@@ -17,6 +17,7 @@
 #include <linux/err.h>
 #include <linux/string.h>
 #include <linux/mutex.h>
+#include <linux/clk.h>
 
 #include <asm/clkdev.h>
 #include <mach/clkdev.h>