summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-02-10 01:45:30 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:30 -0800
commit5ebb4078af0dab866fdf57f84f72b9e9a7e8c6b8 (patch)
treed6405c9338fbc24fea4fccb98f3b9291e70b40f6
parent224299d444ce97e0c78a9e8ea930589ff8861404 (diff)
downloadlinux-stable-5ebb4078af0dab866fdf57f84f72b9e9a7e8c6b8.tar.gz
linux-stable-5ebb4078af0dab866fdf57f84f72b9e9a7e8c6b8.tar.bz2
linux-stable-5ebb4078af0dab866fdf57f84f72b9e9a7e8c6b8.zip
[PATCH] Char: moxa, use PCI_DEVICE
Use PCI_DEVICE macro in pci_device_id list. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/moxa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 381c79e9b350..a0eb088b75b0 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -83,12 +83,12 @@ static char *moxa_brdname[] =
#ifdef CONFIG_PCI
static struct pci_device_id moxa_pcibrds[] = {
- { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C218, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, MOXA_BOARD_C218_PCI },
- { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C320, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, MOXA_BOARD_C320_PCI },
- { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP204J, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, MOXA_BOARD_CP204J },
+ { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C218),
+ .driver_data = MOXA_BOARD_C218_PCI },
+ { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_C320),
+ .driver_data = MOXA_BOARD_C320_PCI },
+ { PCI_DEVICE(PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP204J),
+ .driver_data = MOXA_BOARD_CP204J },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, moxa_pcibrds);