From 364fcd3af50b634e31221c5d2dfada469f509a4f Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 19 Mar 2012 21:50:12 +0400 Subject: [PATCH] --- yaml --- r: 304264 b: refs/heads/master c: 30b768161564891a5109db1520bfc954ca2b3649 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main_26.c | 5 +---- trunk/drivers/staging/xgifb/vb_struct.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9d7684346287..081e5197d4d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef23b21061bb26469646f9ad9f1c6584ca0c5b49 +refs/heads/master: 30b768161564891a5109db1520bfc954ca2b3649 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index 641fd8d18242..bc542a57d2a0 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -358,7 +358,6 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr, static void XGIRegInit(struct vb_device_info *XGI_Pr, unsigned long BaseAddr) { - XGI_Pr->RelIO = BaseAddr; XGI_Pr->P3c4 = BaseAddr + 0x14; XGI_Pr->P3d4 = BaseAddr + 0x24; XGI_Pr->P3c0 = BaseAddr + 0x10; @@ -1911,11 +1910,9 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, xgifb_info->mmio_base = pci_resource_start(pdev, 1); xgifb_info->mmio_size = pci_resource_len(pdev, 1); xgifb_info->vga_base = pci_resource_start(pdev, 2) + 0x30; - hw_info->pjIOAddress = (unsigned char *)xgifb_info->vga_base; - /* XGI_Pr.RelIO = ioremap(pci_resource_start(pdev, 2), 128) + 0x30; */ pr_info("Relocate IO address: %lx [%08lx]\n", (unsigned long)pci_resource_start(pdev, 2), - xgifb_info->dev_info.RelIO); + xgifb_info->vga_base); if (pci_enable_device(pdev)) { ret = -EIO; diff --git a/trunk/drivers/staging/xgifb/vb_struct.h b/trunk/drivers/staging/xgifb/vb_struct.h index a5bd56af92b1..9287658eea03 100644 --- a/trunk/drivers/staging/xgifb/vb_struct.h +++ b/trunk/drivers/staging/xgifb/vb_struct.h @@ -236,7 +236,6 @@ struct vb_device_info { void __iomem *FBAddr; unsigned long BaseAddr; - unsigned long RelIO; unsigned char (*CR6B)[4]; unsigned char (*CR6E)[4];