Merge remote-tracking branch 'scott/next' into next

[mirror_ubuntu-artful-kernel.git] / drivers / staging / crystalhd / crystalhd_lnx.c

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 190b9b924368843f6f688a8ea32819ea329d8af9..99eefd0291c31503199621dfa9bcb9d7e3438d21 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -703,7 +703,7 @@ static int chd_dec_pci_resume(struct pci_dev *pdev)
 }
 #endif
 
-static DEFINE_PCI_DEVICE_TABLE(chd_dec_pci_id_table) = {
+static const struct pci_device_id chd_dec_pci_id_table[] = {
        { PCI_VDEVICE(BROADCOM, 0x1612), 8 },
        { 0, },
 };