---

yaml --- r: 156504 b: refs/heads/master c: 54e3462 h: refs/heads/master v: v3
git-mirror · Aug 7, 2009 · 49809bd · 49809bd
1 parent bb4f5b4
commit 49809bd
Show file tree

Hide file tree

Showing 102 changed files with 732 additions and 987 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36b8659f9316b24c514a7c8290596b2382b91dd2
+refs/heads/master: 54e346215e4fe2ca8c94c54e546cc61902060510
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

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