diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 09:00:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 09:00:30 -0700 |
| commit | 5c8e191e8437616a498a8e1cc0af3dd0d32bbff2 (patch) | |
| tree | 78ed04467e3bd034eaa9696cdf8d668ba7e16381 /arch/x86/mach-visws/setup.c | |
| parent | cbfee34520666862f8ff539e580c48958fbb7706 (diff) | |
| parent | 3ea335100014785fd2518461705654b200e58d00 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
Remove magic macros for screen_info structure members
[x86] remove uses of magic macros for boot_params access
Diffstat (limited to 'arch/x86/mach-visws/setup.c')
| -rw-r--r-- | arch/x86/mach-visws/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mach-visws/setup.c b/arch/x86/mach-visws/setup.c index 1f81f10e03a..de4c9dbd086 100644 --- a/arch/x86/mach-visws/setup.c +++ b/arch/x86/mach-visws/setup.c @@ -152,7 +152,7 @@ char * __init machine_specific_memory_setup(void) { long long gfx_mem_size = 8 * MB; - mem_size = ALT_MEM_K; + mem_size = boot_params.alt_mem_k; if (!mem_size) { printk(KERN_WARNING "Bootloader didn't set memory size, upgrade it !\n"); |