diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-03-16 14:35:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-17 15:59:34 -0700 |
| commit | a05f8f86e49749f239c49257db1d3ac6f474f0dd (patch) | |
| tree | 416022df1eac41b25b396e6a8a32dec6c65716ab /drivers/misc | |
| parent | 34e267d0f49ef4c54eb7b2abbb1b001fa6f26f0e (diff) | |
| download | linux-a05f8f86e49749f239c49257db1d3ac6f474f0dd.tar.bz2 | |
mei: don't use deprecated DEFINE_PCI_DEVICE_TABLE macro
Using struct pci_device_id is preferred over
deprecated DEFINE_PCI_DEVICE_TABLE macro
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/pci-me.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/pci-txe.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index 135ea06ea750..1c8fd3a3e135 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -41,7 +41,7 @@ #include "hw-me.h" /* mei_pci_tbl - PCI Device ID Table */ -static DEFINE_PCI_DEVICE_TABLE(mei_me_pci_tbl) = { +static const struct pci_device_id mei_me_pci_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82946GZ)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82G35)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, MEI_DEV_ID_82Q965)}, diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index a5bf39ad3ff1..ad3adb009a1e 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c @@ -34,7 +34,7 @@ #include "mei_dev.h" #include "hw-txe.h" -static DEFINE_PCI_DEVICE_TABLE(mei_txe_pci_tbl) = { +static const struct pci_device_id mei_txe_pci_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0F18)}, /* Baytrail */ {0, } }; |