From e58872ac34ddcc14dce29a6c2831f20f59f92e7c Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sat, 21 May 2011 19:42:54 +0000 Subject: [PATCH] --- yaml --- r: 251111 b: refs/heads/master c: e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289 h: refs/heads/master i: 251109: e63ea2f4eba0c6de0509a19fa161c885a89dcc8d 251107: 18a7e09914764344b14b7c8025d74daba8d4cd8f 251103: 4e6c9cf39eceba5e0252e1294ac1aaa3c9757cc8 v: v3 --- [refs] | 2 +- trunk/drivers/video/amifb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a178848da602..312cc66673bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9b52cf4617bedccef64cee63ba8ec68b213bc21 +refs/heads/master: e3e4e9c61eb7bbd1171a2b948f1ea4591bac8289 diff --git a/trunk/drivers/video/amifb.c b/trunk/drivers/video/amifb.c index e5d6b56d4447..603f84fae6a1 100644 --- a/trunk/drivers/video/amifb.c +++ b/trunk/drivers/video/amifb.c @@ -2295,7 +2295,7 @@ static int __init amifb_probe(struct platform_device *pdev) defmode = amiga_vblank == 50 ? DEFMODE_PAL : DEFMODE_NTSC; if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > - VIDEOMEMSIZE_ECS_1M) + VIDEOMEMSIZE_ECS_2M) fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_2M; else fb_info.fix.smem_len = VIDEOMEMSIZE_ECS_1M; @@ -2312,7 +2312,7 @@ static int __init amifb_probe(struct platform_device *pdev) maxfmode = TAG_FMODE_4; defmode = DEFMODE_AGA; if (amiga_chip_avail()-CHIPRAM_SAFETY_LIMIT > - VIDEOMEMSIZE_AGA_1M) + VIDEOMEMSIZE_AGA_2M) fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_2M; else fb_info.fix.smem_len = VIDEOMEMSIZE_AGA_1M;