diff options
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 4b198d9d0de3..5b0bffb7fcc9 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -192,7 +192,7 @@ EXPORT_SYMBOL(ist_info); | |||
192 | extern void early_cpu_init(void); | 192 | extern void early_cpu_init(void); |
193 | extern int root_mountflags; | 193 | extern int root_mountflags; |
194 | 194 | ||
195 | unsigned long saved_videomode; | 195 | unsigned long saved_video_mode; |
196 | 196 | ||
197 | #define RAMDISK_IMAGE_START_MASK 0x07FF | 197 | #define RAMDISK_IMAGE_START_MASK 0x07FF |
198 | #define RAMDISK_PROMPT_FLAG 0x8000 | 198 | #define RAMDISK_PROMPT_FLAG 0x8000 |
@@ -763,7 +763,7 @@ void __init setup_arch(char **cmdline_p) | |||
763 | edid_info = boot_params.edid_info; | 763 | edid_info = boot_params.edid_info; |
764 | apm_info.bios = boot_params.apm_bios_info; | 764 | apm_info.bios = boot_params.apm_bios_info; |
765 | ist_info = boot_params.ist_info; | 765 | ist_info = boot_params.ist_info; |
766 | saved_videomode = boot_params.hdr.vid_mode; | 766 | saved_video_mode = boot_params.hdr.vid_mode; |
767 | if( boot_params.sys_desc_table.length != 0 ) { | 767 | if( boot_params.sys_desc_table.length != 0 ) { |
768 | set_mca_bus(boot_params.sys_desc_table.table[3] & 0x2); | 768 | set_mca_bus(boot_params.sys_desc_table.table[3] & 0x2); |
769 | machine_id = boot_params.sys_desc_table.table[0]; | 769 | machine_id = boot_params.sys_desc_table.table[0]; |