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_670x.c | |
| parent | dc1da7f7bae9e71e56f365d7e987760c88c116bd (diff) | |
| download | kernel_samsung_smdk4412-4e40cee9c8a46d4231d28ae7ae6d9938cf0526d5.zip kernel_samsung_smdk4412-4e40cee9c8a46d4231d28ae7ae6d9938cf0526d5.tar.gz kernel_samsung_smdk4412-4e40cee9c8a46d4231d28ae7ae6d9938cf0526d5.tar.bz2 | |
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_670x.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_670x.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index 68221bf..44ae836 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c @@ -47,8 +47,6 @@ Commands are not supported. #include "mite.h" -#define PCI_VENDOR_ID_NATINST 0x1093 - #define AO_VALUE_OFFSET 0x00 #define AO_CHAN_OFFSET 0x0c #define AO_STATUS_OFFSET 0x10 @@ -91,12 +89,9 @@ static const struct ni_670x_board ni_670x_boards[] = { }; static DEFINE_PCI_DEVICE_TABLE(ni_670x_pci_table) = { - { - PCI_VENDOR_ID_NATINST, 0x2c90, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { - PCI_VENDOR_ID_NATINST, 0x1920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, - /*{ PCI_VENDOR_ID_NATINST, 0x0000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },*/ - { - 0} + {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2c90)}, + {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1920)}, + {0} }; MODULE_DEVICE_TABLE(pci, ni_670x_pci_table); |