diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 16:52:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:58 -0700 |
| commit | 4e40cee9c8a46d4231d28ae7ae6d9938cf0526d5 (patch) | |
| tree | 419a5c8c55c1879d21baecb0ff0ab0d44ede2552 /drivers/staging/comedi/drivers/ni_labpc.c | |
| parent | dc1da7f7bae9e71e56f365d7e987760c88c116bd (diff) | |
Staging: comedi: use the standard NI pci device id
Don't redefine something that we already have in the core
kernel. Also move to use PCI_DEVICE() macros to make things
a bit simpler when changing the define.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 9b840a96baf..67c8a538802 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -499,9 +499,8 @@ static struct comedi_driver driver_labpc = { #ifdef CONFIG_COMEDI_PCI static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = { - { - PCI_VENDOR_ID_NATINST, 0x161, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { - 0} + {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x161)}, + {0} }; MODULE_DEVICE_TABLE(pci, labpc_pci_table); |