diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-19 04:00:00 +0000 |
| commit | 46e045034336a2cc90c1798cd7cc07af744ddfd6 (patch) | |
| tree | 3b9b51fc482e729f663d25333e77fbed9aaa939a /drivers/video/aty128fb.c | |
| parent | 31dc59d503a02e84c4de98826452acaeb56dc15a (diff) | |
Merge with Linux 2.3.99-pre4.
Diffstat (limited to 'drivers/video/aty128fb.c')
| -rw-r--r-- | drivers/video/aty128fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/aty128fb.c b/drivers/video/aty128fb.c index 50c1f0bda..496363a6b 100644 --- a/drivers/video/aty128fb.c +++ b/drivers/video/aty128fb.c @@ -1210,7 +1210,7 @@ aty128_set_par(struct aty128fb_par *par, if (par->accel_flags & FB_ACCELF_TEXT) aty128_init_engine(par, info); -#ifdef CONFIG_FB_COMPAT_XPMAC +#if 0/*def CONFIG_FB_COMPAT_XPMAC*/ #if 0 /* use this when macmodes gets updated */ if (!console_fb_info || console_fb_info == &info->fb_info) { disp_info.width = ((par->crtc.v_total >> 16) & 0x7ff)+1; |