Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.

Browse source 
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
This commit is contained in:
Ben Collins 2006-10-18 08:53:37 -04:00
parent f3f6f9aace
commit 996f324767
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/video/valkyriefb.c
View file

@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
printk(KERN_INFO "Monitor sense value = 0x%x\n", p->sense); printk(KERN_INFO "Monitor sense value = 0x%x\n", p->sense);
/* Try to pick a video mode out of NVRAM if we have one. */ /* Try to pick a video mode out of NVRAM if we have one. */
#ifndef CONFIG_MAC #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
if (default_vmode == VMODE_NVRAM) { if (default_vmode == VMODE_NVRAM) {
default_vmode = nvram_read_byte(NV_VMODE); default_vmode = nvram_read_byte(NV_VMODE);
if (default_vmode <= 0 if (default_vmode <= 0
@ -297,7 +297,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
default_vmode = mac_map_monitor_sense(p->sense); default_vmode = mac_map_monitor_sense(p->sense);
if (!valkyrie_reg_init[default_vmode - 1]) if (!valkyrie_reg_init[default_vmode - 1])
default_vmode = VMODE_640_480_67; default_vmode = VMODE_640_480_67;
#ifndef CONFIG_MAC #if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
if (default_cmode == CMODE_NVRAM) if (default_cmode == CMODE_NVRAM)
default_cmode = nvram_read_byte(NV_CMODE); default_cmode = nvram_read_byte(NV_CMODE);
#endif #endif