Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363386
b: refs/heads/master
c: dcf9cfd
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent 70cb6a5 commit 11d0e5b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a4493f07c67bb774519189044ae90034466748a6
refs/heads/master: dcf9cfd3b1807a28fd46ca73489bc401827fd933
21 changes: 10 additions & 11 deletions trunk/drivers/staging/comedi/drivers/ni_6527.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,6 @@ static const struct ni6527_board ni6527_boards[] = {

#define this_board ((const struct ni6527_board *)dev->board_ptr)

static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b10)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b20)},
{0}
};

MODULE_DEVICE_TABLE(pci, ni6527_pci_table);

struct ni6527_private {
struct mite_struct *mite;
unsigned int filter_interval;
Expand Down Expand Up @@ -454,10 +446,17 @@ static int ni6527_pci_probe(struct pci_dev *dev,
return comedi_pci_auto_config(dev, &ni6527_driver, id->driver_data);
}

static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b10) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b20) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, ni6527_pci_table);

static struct pci_driver ni6527_pci_driver = {
.name = DRIVER_NAME,
.id_table = ni6527_pci_table,
.probe = ni6527_pci_probe,
.name = DRIVER_NAME,
.id_table = ni6527_pci_table,
.probe = ni6527_pci_probe,
.remove = comedi_pci_auto_unconfig,
};
module_comedi_pci_driver(ni6527_driver, ni6527_pci_driver);
Expand Down

0 comments on commit 11d0e5b

Please sign in to comment.