Pavel B. Cheblakov wrote: > From: Pavel Cheblakov <[email protected]>] > > 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 > > The mainline commit: > http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commit;h=24c4a3b29255f9f8bc48d93597a58256b5a1f83f > > Signed-off-by: Pavel Cheblakov <[email protected]> > --- > Hello, Wolfgang > > I'm sorry. Previous patch really doesn't contain DEFINE_PCI_DEVICE_TABLE > macro. > I've fixed it.
The bigger problem is that I cannot apply the patch. > Index: kernel/2.6/drivers/net/can/sja1000/plx_pci.c > =================================================================== > --- kernel/2.6/drivers/net/can/sja1000/plx_pci.c > (.../vendor/socketcan/1120) (revision 220) > +++ kernel/2.6/drivers/net/can/sja1000/plx_pci.c (.../socketcan/trunk) > (revision 220) > @@ -6,7 +6,6 @@ > * Copyright (C) 2008 Markus Plessing <[email protected]> > * Copyright (C) 2008 Sebastian Haas <[email protected]> > * > - * There is one space too much for the sync lines. It should be: > * Copyright (C) 2008 Markus Plessing <[email protected]> > * Copyright (C) 2008 Sebastian Haas <[email protected]> > * > - * Don't ask me why. Could you please resend it as attachment? Thanks, Wolfgang. _______________________________________________ Socketcan-core mailing list [email protected] https://lists.berlios.de/mailman/listinfo/socketcan-core
