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

Signed-off-by: Ben Collins <[email protected]>
mna · Oct 18, 2006 · f3f6f9a · f3f6f9a
1 parent b023429
commit f3f6f9a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
@@ -339,20 +339,23 @@ static int __devinit platinum_init_fb(struct fb_info *info)
 
 	sense = read_platinum_sense(pinfo);
 	printk(KERN_INFO "platinumfb: Monitor sense value = 0x%x, ", sense);
-
 	if (default_vmode == VMODE_NVRAM) {
+#ifdef CONFIG_NVRAM
 		default_vmode = nvram_read_byte(NV_VMODE);
 		if (default_vmode <= 0 || default_vmode > VMODE_MAX ||
 		    !platinum_reg_init[default_vmode-1])
+#endif
 			default_vmode = VMODE_CHOOSE;
 	}
 	if (default_vmode == VMODE_CHOOSE) {
 		default_vmode = mac_map_monitor_sense(sense);
 	}
 	if (default_vmode <= 0 || default_vmode > VMODE_MAX)
 		default_vmode = VMODE_640_480_60;
+#ifdef CONFIG_NVRAM
 	if (default_cmode == CMODE_NVRAM)
 		default_cmode = nvram_read_byte(NV_CMODE);
+#endif
 	if (default_cmode < CMODE_8 || default_cmode > CMODE_32)
 		default_cmode = CMODE_8;
 	/*