aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/valkyriefb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/valkyriefb.c')
-rw-r--r--drivers/video/valkyriefb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c
index 47f27924a7d7..06fc19a61192 100644
--- a/drivers/video/valkyriefb.c
+++ b/drivers/video/valkyriefb.c
@@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
284 printk(KERN_INFO "Monitor sense value = 0x%x\n", p->sense); 284 printk(KERN_INFO "Monitor sense value = 0x%x\n", p->sense);
285 285
286 /* Try to pick a video mode out of NVRAM if we have one. */ 286 /* Try to pick a video mode out of NVRAM if we have one. */
287#ifndef CONFIG_MAC 287#if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
288 if (default_vmode == VMODE_NVRAM) { 288 if (default_vmode == VMODE_NVRAM) {
289 default_vmode = nvram_read_byte(NV_VMODE); 289 default_vmode = nvram_read_byte(NV_VMODE);
290 if (default_vmode <= 0 290 if (default_vmode <= 0
@@ -297,7 +297,7 @@ static void __init valkyrie_choose_mode(struct fb_info_valkyrie *p)
297 default_vmode = mac_map_monitor_sense(p->sense); 297 default_vmode = mac_map_monitor_sense(p->sense);
298 if (!valkyrie_reg_init[default_vmode - 1]) 298 if (!valkyrie_reg_init[default_vmode - 1])
299 default_vmode = VMODE_640_480_67; 299 default_vmode = VMODE_640_480_67;
300#ifndef CONFIG_MAC 300#if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
301 if (default_cmode == CMODE_NVRAM) 301 if (default_cmode == CMODE_NVRAM)
302 default_cmode = nvram_read_byte(NV_CMODE); 302 default_cmode = nvram_read_byte(NV_CMODE);
303#endif 303#endif