]> rtime.felk.cvut.cz Git - socketcan-devel.git/commit
plx_pci: sync with net-next-2.6
authorwolf <wolf@030b6a49-0b11-0410-94ab-b0dab22257f2>
Thu, 11 Feb 2010 12:33:56 +0000 (12:33 +0000)
committerwolf <wolf@030b6a49-0b11-0410-94ab-b0dab22257f2>
Thu, 11 Feb 2010 12:33:56 +0000 (12:33 +0000)
commit772f090df469e4bbc30fa55d73601620dc8a1f40
tree89e384263c2bedda02ef5866dcbade34b70ca41b
parent1abfb088a5ed4203009f7a6614018b0e74eee615
plx_pci: sync with net-next-2.6

This patch makes the plx_pci driver in the BerliOS repo same as in
net-next-2.6

Changes since previous revision (1120):
- Added some defines for static inline int plx_pci_check_sja1000(...)
- static struct pci_device_id plx_pci_tbl[] replaced by
  static DEFINE_PCI_DEVICE_TABLE(plx_pci_tbl)
- Typo fixed
- Changed order of device info to have the PCI devices in alphabetical
  order

From net-next-2.6 commit 24c4a3b29255f9f8bc48d93597a58256b5a1f83f

Signed-off-by: Pavel Cheblakov <P.B.Cheblakov@inp.nsk.su>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@1125 030b6a49-0b11-0410-94ab-b0dab22257f2
kernel/2.6/drivers/net/can/sja1000/Kconfig
kernel/2.6/drivers/net/can/sja1000/plx_pci.c