diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /arch/arm/kernel/setup.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'arch/arm/kernel/setup.c')
| -rw-r--r-- | arch/arm/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 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 |