Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 224299d4 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

[PATCH] Char: moxa, devids cleanup 



Move them to pci_ids.h

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c5b466e7

drivers/char/moxa.c

+3 −16
Original line number Diff line number Diff line
@@ -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 }

};

include/linux/pci_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -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