diff options
-rw-r--r-- | arch/arm/kernel/head.S | 7 | ||||
-rw-r--r-- | include/asm-arm/mach/arch.h | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 1aca1775b28f..84277fe818a1 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
@@ -28,10 +28,9 @@ | |||
28 | #define PROCINFO_INITFUNC 12 | 28 | #define PROCINFO_INITFUNC 12 |
29 | 29 | ||
30 | #define MACHINFO_TYPE 0 | 30 | #define MACHINFO_TYPE 0 |
31 | #define MACHINFO_PHYSRAM 4 | 31 | #define MACHINFO_PHYSIO 4 |
32 | #define MACHINFO_PHYSIO 8 | 32 | #define MACHINFO_PGOFFIO 8 |
33 | #define MACHINFO_PGOFFIO 12 | 33 | #define MACHINFO_NAME 12 |
34 | #define MACHINFO_NAME 16 | ||
35 | 34 | ||
36 | #define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET) | 35 | #define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET) |
37 | 36 | ||
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h index 2cd57b4d64d9..fd2f9bf4dcc6 100644 --- a/include/asm-arm/mach/arch.h +++ b/include/asm-arm/mach/arch.h | |||
@@ -10,19 +10,16 @@ | |||
10 | 10 | ||
11 | #ifndef __ASSEMBLY__ | 11 | #ifndef __ASSEMBLY__ |
12 | 12 | ||
13 | #include <linux/compiler.h> | ||
14 | |||
15 | struct tag; | 13 | struct tag; |
16 | struct meminfo; | 14 | struct meminfo; |
17 | struct sys_timer; | 15 | struct sys_timer; |
18 | 16 | ||
19 | struct machine_desc { | 17 | struct machine_desc { |
20 | /* | 18 | /* |
21 | * Note! The first five elements are used | 19 | * Note! The first four elements are used |
22 | * by assembler code in head-armv.S | 20 | * by assembler code in head-armv.S |
23 | */ | 21 | */ |
24 | unsigned int nr; /* architecture number */ | 22 | unsigned int nr; /* architecture number */ |
25 | unsigned int __deprecated phys_ram; /* start of physical ram */ | ||
26 | unsigned int phys_io; /* start of physical io */ | 23 | unsigned int phys_io; /* start of physical io */ |
27 | unsigned int io_pg_offst; /* byte offset for io | 24 | unsigned int io_pg_offst; /* byte offset for io |
28 | * page tabe entry */ | 25 | * page tabe entry */ |