summaryrefslogtreecommitdiff
path: root/drivers/char/moxa.c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-02-10 12:45:29 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 21:51:30 +0300
commit224299d444ce97e0c78a9e8ea930589ff8861404 (patch)
tree9dce18ace63cbadc9cab487814a46ee1f617dbc9 /drivers/char/moxa.c
parentc5b466e70fef18f7e0de88f81fad0b83614444a8 (diff)
downloadlinux-224299d444ce97e0c78a9e8ea930589ff8861404.tar.xz
[PATCH] Char: moxa, devids cleanup
Move them to pci_ids.h 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>
Diffstat (limited to 'drivers/char/moxa.c')
-rw-r--r--drivers/char/moxa.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 3c8858cbe102..381c79e9b350 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -64,19 +64,6 @@
#define MOXA_BUS_TYPE_ISA 0
#define MOXA_BUS_TYPE_PCI 1
-#ifndef PCI_VENDOR_ID_MOXA
-#define PCI_VENDOR_ID_MOXA 0x1393
-#endif
-#ifndef PCI_DEVICE_ID_CP204J
-#define PCI_DEVICE_ID_CP204J 0x2040
-#endif
-#ifndef PCI_DEVICE_ID_C218
-#define PCI_DEVICE_ID_C218 0x2180
-#endif
-#ifndef PCI_DEVICE_ID_C320
-#define PCI_DEVICE_ID_C320 0x3200
-#endif
-
enum {
MOXA_BOARD_C218_PCI = 1,
MOXA_BOARD_C218_ISA,
@@ -96,11 +83,11 @@ static char *moxa_brdname[] =
#ifdef CONFIG_PCI
static struct pci_device_id moxa_pcibrds[] = {
- { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_C218, PCI_ANY_ID, PCI_ANY_ID,
+ { 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_C320, PCI_ANY_ID, PCI_ANY_ID,
+ { 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_CP204J, PCI_ANY_ID, PCI_ANY_ID,
+ { PCI_VENDOR_ID_MOXA, PCI_DEVICE_ID_MOXA_CP204J, PCI_ANY_ID, PCI_ANY_ID,
0, 0, MOXA_BOARD_CP204J },
{ 0 }
};