Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281288
b: refs/heads/master
c: 4e6f403
h: refs/heads/master
v: v3
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Dec 8, 2011
1 parent 29811d1 commit f76639a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d1805b38700c8251139763386e806cdb51662661
refs/heads/master: 4e6f403a3b045070fcb5cdb824862856ea9129a3
5 changes: 2 additions & 3 deletions trunk/drivers/staging/xgifb/vb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f76639a

Please sign in to comment.