---

yaml --- r: 281285 b: refs/heads/master c: 82986dd h: refs/heads/master i: 281283: 0d0a98e v: v3
git-mirror · Dec 8, 2011 · 42c5c1e · 42c5c1e
1 parent 16a94c6
commit 42c5c1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e27060f0e68e519ff62c0334fa8328337b2e39f1
+refs/heads/master: 82986dd9e738996a9d2e508c164d1eb7464c07c6
diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c
@@ -1093,10 +1093,10 @@ static void XGINew_SetDRAMSize_340(struct xgi_hw_device_info *HwDeviceExtension,
 	xgifb_reg_set(pVBInfo->P3c4, 0x21, (unsigned short) (data | 0x20));
 }
 
-static unsigned char *xgifb_copy_rom(struct pci_dev *dev)
+static u8 *xgifb_copy_rom(struct pci_dev *dev)
 {
 	void __iomem *rom_address;
-	unsigned char *rom_copy;
+	u8 *rom_copy;
 	size_t rom_size;
 
 	rom_address = pci_map_rom(dev, &rom_size);
@@ -1119,7 +1119,7 @@ static void ReadVBIOSTablData(struct pci_dev *pdev,
 			      struct vb_device_info *pVBInfo)
 {
 	struct xgifb_video_info *xgifb_info = pci_get_drvdata(pdev);
-	unsigned char *vbios;
+	u8 *vbios;
 	unsigned long i;
 	unsigned char j, k;
 	struct XGI21_LVDSCapStruct *lvds;