---

yaml --- r: 22826 b: refs/heads/master c: a61ea93 h: refs/heads/master v: v3
git-mirror · Mar 21, 2006 · 4b16308 · 4b16308
1 parent daebb4e
commit 4b16308
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71dccd0f158a8077c92d51f213b55991b7a0e47e
+refs/heads/master: a61ea9326d9ba94bcdc21f36bb74aa203657c58f
diff --git a/trunk/arch/arm/kernel/head.S b/trunk/arch/arm/kernel/head.S
@@ -28,10 +28,9 @@
 #define PROCINFO_INITFUNC	12
 
 #define MACHINFO_TYPE		0
-#define MACHINFO_PHYSRAM	4
-#define MACHINFO_PHYSIO		8
-#define MACHINFO_PGOFFIO	12
-#define MACHINFO_NAME		16
+#define MACHINFO_PHYSIO		4
+#define MACHINFO_PGOFFIO	8
+#define MACHINFO_NAME		12
 
 #define KERNEL_RAM_ADDR	(PAGE_OFFSET + TEXT_OFFSET)
 

diff --git a/trunk/include/asm-arm/mach/arch.h b/trunk/include/asm-arm/mach/arch.h
@@ -10,19 +10,16 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/compiler.h>
-
 struct tag;
 struct meminfo;
 struct sys_timer;
 
 struct machine_desc {
 	/*
-	 * Note! The first five elements are used
+	 * Note! The first four elements are used
 	 * by assembler code in head-armv.S
 	 */
 	unsigned int		nr;		/* architecture number	*/
-	unsigned int __deprecated phys_ram;	/* start of physical ram */
 	unsigned int		phys_io;	/* start of physical io	*/
 	unsigned int		io_pg_offst;	/* byte offset for io 
 						 * page tabe entry	*/