---

yaml --- r: 270190 b: refs/heads/master c: f29781a h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · 1ef320d · 1ef320d
1 parent 9eb804e
commit 1ef320d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34561b557ff0a3ee0c4bdaf5a5198246e41826e4
+refs/heads/master: f29781ac69c913272acf915c4d3aacc44af5ddfc
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -590,6 +590,7 @@ config ARCH_W90X900
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select GENERIC_CLOCKEVENTS
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Nuvoton (Winbond logic dept.) ARM9 processor,
 	  At present, the w90x900 has been renamed nuc900, regarding

diff --git a/trunk/arch/arm/mach-w90x900/include/mach/memory.h b/trunk/arch/arm/mach-w90x900/include/mach/memory.h