diff --git a/[refs] b/[refs] index 90c4d826dc45..7e696909e053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7054c2a3ce6a7b6a4246f3f7ac8527935618c1d +refs/heads/master: e27060f0e68e519ff62c0334fa8328337b2e39f1 diff --git a/trunk/drivers/staging/xgifb/vgatypes.h b/trunk/drivers/staging/xgifb/vgatypes.h index 9b939b75c309..9e166bbb00c4 100644 --- a/trunk/drivers/staging/xgifb/vgatypes.h +++ b/trunk/drivers/staging/xgifb/vgatypes.h @@ -51,8 +51,6 @@ struct xgi_hw_device_info { unsigned long ulExternalChip; /* NO VB or other video bridge*/ /* if ujVBChipID = VB_CHIP_UNKNOWN, */ - unsigned char *pjVirtualRomBase; /* ROM image */ - void __iomem *pjVideoMemoryAddress;/* base virtual memory address */ /* of Linear VGA memory */