diff options
| author | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:53:37 -0400 |
|---|---|---|
| committer | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:53:37 -0400 |
| commit | 996f324767fd24b7cc682801277add2a4f276635 (patch) | |
| tree | a94e8ebc1e20c20b3a5444ddfb8a73dcd341eb3e | |
| parent | f3f6f9aaced9c8453ef45956a23295e5c2328124 (diff) | |
[valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
| -rw-r--r-- | drivers/video/valkyriefb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/valkyriefb.c b/drivers/video/valkyriefb.c index 47f27924a7d..06fc19a6119 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) 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 |