p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

linux-can-fixes-for-4.3-20150930 

-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABCgAGBQJWC8KGAAoJEP5prqPJtc/HhRIIAKpS6sm1F37pOvLCrcDtxD5w
 2bYceQZzQ2t7NVFk6RLrSUGjCezyk/tQvB4mnYKarbSwkvTv8+SvW+NsdkH6yTWR
 hHP3LbN04LwauWzOm3xk3NRKTTLBLREjZiG2PhSZf86yyOuCVWZV2nfZLjSS7cqD
 5AucrUOI19yX50IE6U9rEOjhlXZqhYSWtrlQmAc46ZRYlRCDWFc64Nzx8uMXp4eg
 7/Uc2fjw95p4Pq8DKgYdaPWp5do2+frbh5Ydjn+dE+/vZRvJ0KOUq+HjAUtZesI0
 P/5NTpS0hCupyjDiGbweMWS7anCIvcw+c/F338FX1vZll6noJBFHgoBkn3vnf1I=
 =UZhg
 -----END PGP SIGNATURE-----

Merge tag 'linux-can-fixes-for-4.3-20150930' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

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>
This commit is contained in:
David S. Miller 2015-10-05 03:07:02 -07:00
parent 9dc80a7431 7253054e5d
commit 74910ea49d
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/can/sja1000/peak_pci.c
View File

@ -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,},