Skip to content

L
linux-davinci
Commit 996f3247 authored by Ben Collins's avatar Ben Collins
Browse files
Options

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

Signed-off-by: default avatarBen Collins <bcollins@ubuntu.com>
parent f3f6f9aa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/video/valkyriefb.c
View file @ 996f3247
...@@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p) ...@@ -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) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment