From 7e6d9adf5bf37ba1c191add86af9fc6482c31419 Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Fri, 2 Sep 2011 11:55:33 +0800 Subject: [PATCH] --- yaml --- r: 268327 b: refs/heads/master c: 00fc8958c98d9f03e27fe81c8b3a3eeb82edb4cd h: refs/heads/master i: 268325: 893e7206535382ca22fe717ed157ae630bd0abab 268323: 521673138131bfdbb43b9cce429bf5f0f2293da1 268319: f22de61919351066b3eaf255cce00f6f9931bc2d v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d35e6c606861..c20e3a9ee010 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8eea455e6dae0fc9e509d4f32c3773567c4cb802 +refs/heads/master: 00fc8958c98d9f03e27fe81c8b3a3eeb82edb4cd diff --git a/trunk/drivers/staging/cx25821/cx25821-core.c b/trunk/drivers/staging/cx25821/cx25821-core.c index 8e8a56d253e2..26d2879f60e5 100644 --- a/trunk/drivers/staging/cx25821/cx25821-core.c +++ b/trunk/drivers/staging/cx25821/cx25821-core.c @@ -1473,7 +1473,7 @@ static void __devexit cx25821_finidev(struct pci_dev *pci_dev) kfree(dev); } -static struct pci_device_id cx25821_pci_tbl[] = { +static DEFINE_PCI_DEVICE_TABLE(cx25821_pci_tbl) = { { /* CX25821 Athena */ .vendor = 0x14f1,