From da29974773fae12ad71060630b97645142e15e0c Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Sat, 7 Aug 2010 03:06:52 -0400 Subject: [PATCH] --- yaml --- r: 219673 b: refs/heads/master c: b6cdc4056f642884d6819597c315753264e305a1 h: refs/heads/master i: 219671: ec85eacf72dd41fc5a1169d6ac490810c735d1f0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/XGI_main.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0380b751fa61..95c2a1de9383 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16f08494f4523de348988763b74e5756d482978b +refs/heads/master: b6cdc4056f642884d6819597c315753264e305a1 diff --git a/trunk/drivers/staging/xgifb/XGI_main.h b/trunk/drivers/staging/xgifb/XGI_main.h index fd1152eb2c92..06f62ee8c588 100644 --- a/trunk/drivers/staging/xgifb/XGI_main.h +++ b/trunk/drivers/staging/xgifb/XGI_main.h @@ -46,8 +46,7 @@ #define XGI_IOTYPE2 __iomem #define XGIINITSTATIC static -static struct pci_device_id __devinitdata xgifb_pci_table[] = { - +static DEFINE_PCI_DEVICE_TABLE(xgifb_pci_table) = { { PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_27, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, { PCI_VENDOR_ID_XG, PCI_DEVICE_ID_XG_40, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},