From 53949988fb2770e25d15e8962e5aa8709a3181e5 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Sat, 10 Feb 2007 01:45:29 -0800
Subject: [PATCH] --- yaml --- r: 47551 b: refs/heads/master c:
 224299d444ce97e0c78a9e8ea930589ff8861404 h: refs/heads/master i:   47549:
 d79324c0a4e0253d3df3e2fd1e8d7f54c59fcf8c   47547:
 ed12a2ede37f4376ce5953f1502905b7f4aa4b93   47543:
 80b73e1cb193f7cdaa846ab3dfea1e5a1d285638   47535:
 c5b8431703c6bd0a536b6fd832e94768871694b9   47519:
 14dbc6792e78a857684a057158047d6c5c74cb2a   47487:
 167bc3405500b9507579bd1e1c9638e5da06183b v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/char/moxa.c     | 19 +++----------------
 trunk/include/linux/pci_ids.h |  3 +++
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index ac88d6d4e466..20dd136a4418 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5b466e70fef18f7e0de88f81fad0b83614444a8
+refs/heads/master: 224299d444ce97e0c78a9e8ea930589ff8861404
diff --git a/trunk/drivers/char/moxa.c b/trunk/drivers/char/moxa.c
index 3c8858cbe102..381c79e9b350 100644
--- a/trunk/drivers/char/moxa.c
+++ b/trunk/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/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
index e67b68ca235a..e5e5b9ffcfb5 100644
--- a/trunk/include/linux/pci_ids.h
+++ b/trunk/include/linux/pci_ids.h
@@ -1811,6 +1811,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