From f76639ad1f71365d85e685b4a865562d6d5ceab1 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 6 Dec 2011 00:10:42 +0200 Subject: [PATCH] --- yaml --- r: 281288 b: refs/heads/master c: 4e6f403a3b045070fcb5cdb824862856ea9129a3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/vb_init.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6f638217fb05..3bed3c886a7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1805b38700c8251139763386e806cdb51662661 +refs/heads/master: 4e6f403a3b045070fcb5cdb824862856ea9129a3 diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c index 4f56978391ad..c52d74fb9c85 100644 --- a/trunk/drivers/staging/xgifb/vb_init.c +++ b/trunk/drivers/staging/xgifb/vb_init.c @@ -1114,7 +1114,7 @@ static u8 *xgifb_copy_rom(struct pci_dev *dev, size_t *rom_size) return rom_copy; } -static void ReadVBIOSTablData(struct pci_dev *pdev, +static void xgifb_read_vbios(struct pci_dev *pdev, struct vb_device_info *pVBInfo) { struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev); @@ -1523,8 +1523,7 @@ unsigned char XGIInitNew(struct pci_dev *pdev) InitTo330Pointer(HwDeviceExtension->jChipType, pVBInfo); - /* ReadVBIOSData */ - ReadVBIOSTablData(pdev, pVBInfo); + xgifb_read_vbios(pdev, pVBInfo); /* 1.Openkey */ xgifb_reg_set(pVBInfo->P3c4, 0x05, 0x86);