diff options
| author | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:49:31 -0400 |
|---|---|---|
| committer | Ben Collins <bcollins@ubuntu.com> | 2006-10-18 08:49:31 -0400 |
| commit | 4938d3f4f8f1ffd744fa3626df8085118aeb1d79 (patch) | |
| tree | f9bf2168b375c2ac8bb773d5da909a44b2c51de6 /drivers/video | |
| parent | d57cdcffe1180cf9b8d1fce048f80d8c6b159827 (diff) | |
| download | linux-4938d3f4f8f1ffd744fa3626df8085118aeb1d79.tar.gz linux-4938d3f4f8f1ffd744fa3626df8085118aeb1d79.tar.bz2 linux-4938d3f4f8f1ffd744fa3626df8085118aeb1d79.zip | |
[controlfb] Ifdef for when CONFIG_NVRAM isn't enabled.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/controlfb.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c index 8cc6c0e2d27a..04c6d928189b 100644 --- a/drivers/video/controlfb.c +++ b/drivers/video/controlfb.c @@ -415,13 +415,15 @@ static int __init init_control(struct fb_info_control *p) full = p->total_vram == 0x400000; /* Try to pick a video mode out of NVRAM if we have one. */ +#ifdef CONFIG_NVRAM if (default_cmode == CMODE_NVRAM){ cmode = nvram_read_byte(NV_CMODE); if(cmode < CMODE_8 || cmode > CMODE_32) cmode = CMODE_8; } else +#endif cmode=default_cmode; - +#ifdef CONFIG_NVRAM if (default_vmode == VMODE_NVRAM) { vmode = nvram_read_byte(NV_VMODE); if (vmode < 1 || vmode > VMODE_MAX || @@ -432,7 +434,9 @@ static int __init init_control(struct fb_info_control *p) if (control_mac_modes[vmode - 1].m[full] < cmode) vmode = VMODE_640_480_60; } - } else { + } else +#endif + { vmode=default_vmode; if (control_mac_modes[vmode - 1].m[full] < cmode) { if (cmode > CMODE_8) |