summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-09 00:49:38 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-02-09 00:49:38 +0000
commit6fe71521d734a29f63020cac1cbd3f2b21c7a0b0 (patch)
treed9783e7bb405327608fc337cba0d055dcf2a939d /drivers
parent0c8d13b46b89d7689c44a33b0c4ea5f0182ca584 (diff)
downloadmpv-6fe71521d734a29f63020cac1cbd3f2b21c7a0b0.tar.bz2
mpv-6fe71521d734a29f63020cac1cbd3f2b21c7a0b0.tar.xz
g550 memdetect fix - patch by Diego Biurrun <diego@biurrun.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4595 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mga_vid.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mga_vid.c b/drivers/mga_vid.c
index fec46fe89f..d786861a4c 100644
--- a/drivers/mga_vid.c
+++ b/drivers/mga_vid.c
@@ -1302,7 +1302,8 @@ static int mga_vid_find_card(void)
// SDRAM:
case 0x00:
case 0x04: mga_ram_size = 16; break;
- case 0x03: mga_ram_size = 32; break;
+ case 0x03:
+ case 0x05: mga_ram_size = 32; break;
// SGRAM:
case 0x10:
case 0x14: mga_ram_size = 32; break;
@@ -1504,7 +1505,7 @@ static int mga_vid_initialize(void)
mga_vid_in_use = 0;
// printk(KERN_INFO "Matrox MGA G200/G400 YUV Video interface v0.01 (c) Aaron Holtzman \n");
- printk(KERN_INFO "Matrox MGA G200/G400/G450 YUV Video interface v2.01 (c) Aaron Holtzman & A'rpi\n");
+ printk(KERN_INFO "Matrox MGA G200/G400/G450/G550 YUV Video interface v2.01 (c) Aaron Holtzman & A'rpi\n");
if (mga_ram_size) {
if (mga_ram_size<4 || mga_ram_size>64) {