Merge nommu tree

[mv-sheeva.git] / arch / arm / kernel / head.S

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 571d6d58491922e93f071ce31cd1b327272b231c..53b6901f70a699e0ad4358c6a193869c5bd903f8 100644 (file)
--- a/arch/arm/kernel/head.S
+++ b/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)