From cf4972e835d7e827c6aa15ffe3af2e98cb2525cb Mon Sep 17 00:00:00 2001 From: "kirjanov@gmail.com" Date: Fri, 18 Dec 2009 10:59:04 +0300 Subject: [PATCH] --- yaml --- r: 186519 b: refs/heads/master c: 5d372900aa6b14142cc7d7145cc8be1cb6c0d7b6 h: refs/heads/master i: 186517: 60d990122b2e52c36415c5a61b706942b4ee4f49 186515: 27737ebfa72ba30c3fb920f98d8e14273133fe44 186511: bb334879d56df42217d8eab28b8cb8614e6febc6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/slicoss/slicoss.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 2efdade4e049..ee6e9b1e2ae1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c7aeb654d0d7f6d3b8de864c60868aa61f1e283 +refs/heads/master: 5d372900aa6b14142cc7d7145cc8be1cb6c0d7b6 diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index 872717024fd0..4dbd5aa2d980 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -194,14 +194,10 @@ MODULE_PARM_DESC(dynamic_intagg, "Dynamic Interrupt Aggregation Setting"); module_param(intagg_delay, int, 0); MODULE_PARM_DESC(intagg_delay, "uSec Interrupt Aggregation Delay"); -static struct pci_device_id slic_pci_tbl[] __devinitdata = { - {PCI_VENDOR_ID_ALACRITECH, - SLIC_1GB_DEVICE_ID, - PCI_ANY_ID, PCI_ANY_ID,}, - {PCI_VENDOR_ID_ALACRITECH, - SLIC_2GB_DEVICE_ID, - PCI_ANY_ID, PCI_ANY_ID,}, - {0,} +static DEFINE_PCI_DEVICE_TABLE(slic_pci_tbl) = { + { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_1GB_DEVICE_ID) }, + { PCI_DEVICE(PCI_VENDOR_ID_ALACRITECH, SLIC_2GB_DEVICE_ID) }, + { 0 } }; MODULE_DEVICE_TABLE(pci, slic_pci_tbl);