lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Char: moxa, devids cleanup

Browse Source 
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>
This commit is contained in:
Jiri Slaby
2007-02-10 01:45:29 -08:00
committed by Linus Torvalds
parent c5b466e70f
commit 224299d444
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/char/moxa.c
View File

@@ -64,19 +64,6 @@
#define MOXA_BUS_TYPE_ISA 0 #define MOXA_BUS_TYPE_ISA 0
#define MOXA_BUS_TYPE_PCI 1 #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 { enum {
MOXA_BOARD_C218_PCI = 1, MOXA_BOARD_C218_PCI = 1,
MOXA_BOARD_C218_ISA, MOXA_BOARD_C218_ISA,
@@ -96,11 +83,11 @@ static char *moxa_brdname[] =
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct pci_device_id moxa_pcibrds[] = { 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 }, 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 }, 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, 0, MOXA_BOARD_CP204J },
{ 0 } { 0 }
}; };

3
include/linux/pci_ids.h
View File

@@ -1811,6 +1811,9 @@
#define PCI_DEVICE_ID_MOXA_C168 0x1680 #define PCI_DEVICE_ID_MOXA_C168 0x1680
#define PCI_DEVICE_ID_MOXA_CP168U 0x1681 #define PCI_DEVICE_ID_MOXA_CP168U 0x1681
#define PCI_DEVICE_ID_MOXA_CP168EL 0x1682 #define PCI_DEVICE_ID_MOXA_CP168EL 0x1682
#define PCI_DEVICE_ID_MOXA_CP204J 0x2040
#define PCI_DEVICE_ID_MOXA_C218 0x2180
#define PCI_DEVICE_ID_MOXA_C320 0x3200
#define PCI_VENDOR_ID_CCD 0x1397 #define PCI_VENDOR_ID_CCD 0x1397
#define PCI_DEVICE_ID_CCD_2BD0 0x2bd0 #define PCI_DEVICE_ID_CCD_2BD0 0x2bd0