[valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.
authorBen Collins <bcollins@ubuntu.com>
Wed, 18 Oct 2006 12:53:37 +0000 (08:53 -0400)
committerBen Collins <bcollins@ubuntu.com>
Wed, 18 Oct 2006 12:53:37 +0000 (08:53 -0400)
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
drivers/video/valkyriefb.c

index 47f27924a7d75728424281b8f9255323b0c16832..06fc19a6119249a8a6128799c1d9fd226f36494b 100644 (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);
 
        /* 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) {
                default_vmode = nvram_read_byte(NV_VMODE);
                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);
        if (!valkyrie_reg_init[default_vmode - 1])
                default_vmode = VMODE_640_480_67;
-#ifndef CONFIG_MAC
+#if !defined(CONFIG_MAC) && defined(CONFIG_NVRAM)
        if (default_cmode == CMODE_NVRAM)
                default_cmode = nvram_read_byte(NV_CMODE);
 #endif