diff options
Diffstat (limited to 'drivers/net/can/sja1000/peak_pci.c')
| -rw-r--r-- | drivers/net/can/sja1000/peak_pci.c | 13 | 
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c index f5b82aeb254..6525dbcca4e 100644 --- a/drivers/net/can/sja1000/peak_pci.c +++ b/drivers/net/can/sja1000/peak_pci.c @@ -30,9 +30,10 @@  #include "sja1000.h" -MODULE_AUTHOR("Wolfgang Grandegger <wg@grandegger.com>"); +MODULE_AUTHOR("Stephane Grosjean <s.grosjean@peak-system.com>");  MODULE_DESCRIPTION("Socket-CAN driver for PEAK PCAN PCI family cards");  MODULE_SUPPORTED_DEVICE("PEAK PCAN PCI/PCIe/PCIeC miniPCI CAN cards"); +MODULE_SUPPORTED_DEVICE("PEAK PCAN miniPCIe/cPCI PC/104+ PCI/104e CAN Cards");  MODULE_LICENSE("GPL v2");  #define DRV_NAME  "peak_pci" @@ -64,7 +65,11 @@ struct peak_pci_chan {  #define PEAK_PCI_DEVICE_ID	0x0001	/* for PCI/PCIe slot cards */  #define PEAK_PCIEC_DEVICE_ID	0x0002	/* for ExpressCard slot cards */  #define PEAK_PCIE_DEVICE_ID	0x0003	/* for nextgen PCIe slot cards */ -#define PEAK_MPCI_DEVICE_ID	0x0008	/* The miniPCI slot cards */ +#define PEAK_CPCI_DEVICE_ID	0x0004	/* for nextgen cPCI slot cards */ +#define PEAK_MPCI_DEVICE_ID	0x0005	/* for nextgen miniPCI slot cards */ +#define PEAK_PC_104P_DEVICE_ID	0x0006	/* PCAN-PC/104+ cards */ +#define PEAK_PCI_104E_DEVICE_ID	0x0007	/* PCAN-PCI/104 Express cards */ +#define PEAK_MPCIE_DEVICE_ID	0x0008	/* The miniPCIe slot cards */  #define PEAK_PCI_CHAN_MAX	4 @@ -76,6 +81,10 @@ static DEFINE_PCI_DEVICE_TABLE(peak_pci_tbl) = {  	{PEAK_PCI_VENDOR_ID, PEAK_PCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},  	{PEAK_PCI_VENDOR_ID, PEAK_PCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},  	{PEAK_PCI_VENDOR_ID, PEAK_MPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, +	{PEAK_PCI_VENDOR_ID, PEAK_MPCIE_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, +	{PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, +	{PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,}, +	{PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},  #ifdef CONFIG_CAN_PEAK_PCIEC  	{PEAK_PCI_VENDOR_ID, PEAK_PCIEC_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},  #endif  |