diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/video/acornfb.c | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/video/acornfb.c')
| -rw-r--r-- | drivers/video/acornfb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 35efd479b..6d4c91409 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c @@ -1599,7 +1599,7 @@ acornfb_init(void) } current_par.currcon = -1; - current_par.screen_base = SCREEN2_BASE; + current_par.screen_base = SCREEN_BASE; current_par.screen_base_p = SCREEN_START; current_par.using_vram = 0; @@ -1696,7 +1696,8 @@ acornfb_init(void) v_sync = h_sync / (init_var.yres + init_var.upper_margin + init_var.lower_margin + init_var.vsync_len); - printk("Acornfb: %ldkB %cRAM, %s, using %dx%d, %d.%03dkHz, %dHz\n", + printk(KERN_INFO "Acornfb: %ldkB %cRAM, %s, using %dx%d, " + "%d.%03dkHz, %dHz\n", current_par.screen_size / 1024, current_par.using_vram ? 'V' : 'D', VIDC_NAME, init_var.xres, init_var.yres, |