projects
/
linux-drm-fsl-dcu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
9dc80a7
)
Merge tag 'linux-can-fixes-for-4.3-20150930' of git://git.kernel.org/pub/scm/linux...
author
David S. Miller
<davem@davemloft.net>
Mon, 5 Oct 2015 10:07:02 +0000
(
03:07
-0700)
committer
David S. Miller
<davem@davemloft.net>
Mon, 5 Oct 2015 10:07:02 +0000
(
03:07
-0700)
Marc Kleine-Budde says:
====================
pull-request: can 2015-09-30
this is a pull request of a single patch for 4.3.
The patch is by Stephane Grosjean and add support for the peak OEM PCI card to
the peak_pci driver by adding its device ID.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/sja1000/peak_pci.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/sja1000/peak_pci.c
b/drivers/net/can/sja1000/peak_pci.c
index e5fac368068a2320eb06d207934c4b969356237b..131026fbc2d77cbc3ccb5903daa10f8920f8ae17 100644
(file)
--- a/
drivers/net/can/sja1000/peak_pci.c
+++ b/
drivers/net/can/sja1000/peak_pci.c
@@
-87,6
+87,7
@@
static const struct pci_device_id peak_pci_tbl[] = {
{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,},
+ {PEAK_PCI_VENDOR_ID, PEAK_PCIE_OEM_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,},
{PEAK_PCI_VENDOR_ID, PEAK_PCIEC34_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},