diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-04 10:43:36 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-04 10:43:36 +0100 |
| commit | f9bd6ea446946b97208f9e1528eb5f9ef8f931cb (patch) | |
| tree | 094def9b67b03df1484c9c346cb1a132343f27c5 | |
| parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
| download | talos-obmc-linux-f9bd6ea446946b97208f9e1528eb5f9ef8f931cb.tar.gz talos-obmc-linux-f9bd6ea446946b97208f9e1528eb5f9ef8f931cb.zip | |
[PATCH] ARM: Change 'param_offset' to 'boot_params'
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/kernel/setup.c | 4 | ||||
| -rw-r--r-- | include/asm-arm/mach/arch.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 35b7273cfdb4..c9b69771f92e 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -737,8 +737,8 @@ void __init setup_arch(char **cmdline_p) if (mdesc->soft_reboot) reboot_setup("s"); - if (mdesc->param_offset) - tags = phys_to_virt(mdesc->param_offset); + if (mdesc->boot_params) + tags = phys_to_virt(mdesc->boot_params); /* * If we have the old style parameters, convert them to diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h index a2fbb6558c15..56c6bf4ab0c3 100644 --- a/include/asm-arm/mach/arch.h +++ b/include/asm-arm/mach/arch.h @@ -26,7 +26,7 @@ struct machine_desc { * page tabe entry */ const char *name; /* architecture name */ - unsigned int param_offset; /* parameter page */ + unsigned long boot_params; /* tagged list */ unsigned int video_start; /* start of video RAM */ unsigned int video_end; /* end of video RAM */ |
