[PATCH 6/8] Char: moxa, devids cleanup

From: Jiri Slaby <jirislaby@xxxxxxxxx>
Date: Sun, 31 Dec 2006 02:05:11 +0100 (CET)

moxa, devids cleanup

Move them to pci_ids.h

Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>

---
commit 9e4d8826dd1dbaa7bb9d520b02da25a5a5cefa13
tree 09ff5e387adce87a70c388e83af678fd5552062b
parent c2eee5df210da17dfdea909b89f5db31b577f92a
author Jiri Slaby <jirislaby@xxxxxxxxx> Sun, 31 Dec 2006 01:54:13 +0059
committer Jiri Slaby <jirislaby@xxxxxxxxx> Sun, 31 Dec 2006 01:54:13 +0059

drivers/char/moxa.c | 19 +++----------------
include/linux/pci_ids.h | 3 +++
2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 3c8858c..5c0c0e6 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 }
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 52d1e41..b9bf441 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1809,6 +1809,9 @@
#define PCI_DEVICE_ID_MOXA_C168 0x1680
#define PCI_DEVICE_ID_MOXA_CP168U 0x1681
#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_DEVICE_ID_CCD_2BD0 0x2bd0
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

References:
- [PATCH 1/8] Char: moxa, remove unused allocated page
  - From: Jiri Slaby

Prev by Date: [PATCH 1/8] Char: moxa, remove unused allocated page
Next by Date: [PATCH 2/8] Char: moxa, do not initialize global static
Previous by thread: [PATCH 1/8] Char: moxa, remove unused allocated page
Next by thread: [PATCH 2/8] Char: moxa, do not initialize global static
Index(es):
- Date
- Thread

Relevant Pages

[git pull] jfs update
... commit c5111f504d2a9b0d258d7c4752b4093523315989 ... tree 6a52864aff79691689aea21cb0cb928327d5de5b
... parent 69eb66d7da7dba2696281981347698e1693c2340 ... JFS: Take logsync
lock before testing mp->lsn ... (Linux-Kernel)
[git patches] IDE update
... tree 4105ba774c775cdf53fb5fd3e07158b15218cb27 ... parent 21e2c01dc3e38d466eda5871645878d2c3a33261
... commit 21e2c01dc3e38d466eda5871645878d2c3a33261 ... Splitted up from the Debian
kernel patch. ... (Linux-Kernel)
[git pull] jfs update
... commit be0bf7da19135a7a0f8c275f20c819940be218d9 ... tree c8ba72b711730ce11f52fc20cd7c0e9c4bee7bc0
... parent 5b3030e39049212c975665cdb3eeabcfaf7c94ca ... JFS: Take logsync
lock before testing mp->lsn ... (Linux-Kernel)
[2.6-GIT] NTFS: Release 2.1.23.
... This is a big NTFS update. ... commit ba6d2377c85c9b8a793f455d8c9b6cf31985d70f
... tree 21e65c76db693869c84864af02e91c4b997a6ba5 ... parent af859a42d798f047fbfe198ed315a942662c39d2
... (Linux-Kernel)
(no subject)
... everything up in one tree, so that there's absolutely no record of the ... That
is, you may want to merge multiple parents in _one_ commit, ... each parent you
have merged. ... send the line "unsubscribe linux-kernel" in ... (Linux-Kernel)