diff options
| -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) | |||
| 737 | if (mdesc->soft_reboot) | 737 | if (mdesc->soft_reboot) |
| 738 | reboot_setup("s"); | 738 | reboot_setup("s"); |
| 739 | 739 | ||
| 740 | if (mdesc->param_offset) | 740 | if (mdesc->boot_params) |
| 741 | tags = phys_to_virt(mdesc->param_offset); | 741 | tags = phys_to_virt(mdesc->boot_params); |
| 742 | 742 | ||
| 743 | /* | 743 | /* |
| 744 | * If we have the old style parameters, convert them to | 744 | * 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 { | |||
| 26 | * page tabe entry */ | 26 | * page tabe entry */ |
| 27 | 27 | ||
| 28 | const char *name; /* architecture name */ | 28 | const char *name; /* architecture name */ |
| 29 | unsigned int param_offset; /* parameter page */ | 29 | unsigned long boot_params; /* tagged list */ |
| 30 | 30 | ||
| 31 | unsigned int video_start; /* start of video RAM */ | 31 | unsigned int video_start; /* start of video RAM */ |
| 32 | unsigned int video_end; /* end of video RAM */ | 32 | unsigned int video_end; /* end of video RAM */ |
