On 09/21/2012 11:42 PM, Randy Dunlap wrote: > On 09/02/2012 10:13 AM, Randy Dunlap wrote: > >> From: Randy Dunlap <rdun...@xenotime.net> >> >> Rename generic-sounding function dump_mem() to pcan_dump_mem() >> so that it does not conflict with the dump_mem() function in >> arch/sh/include/asm/kdebug.h. >> >> drivers/net/can/usb/peak_usb/pcan_usb_core.c: error: conflicting types for >> 'dump_mem': => 56:6 >> drivers/net/can/usb/peak_usb/pcan_usb_core.h: error: conflicting types for >> 'dump_mem': => 134:6 >> >> Not tested. >> >> Signed-off-by: Randy Dunlap <rdun...@xenotime.net> >> Reported-by: Geert Uytterhoeven <ge...@linux-m68k.org> >> Cc: Stephane Grosjean <s.grosj...@peak-system.com> >> Cc: Wolfgang Grandegger <w...@grandegger.com> >> Cc: Marc Kleine-Budde <m...@pengutronix.de> > > > ping.
The patch is already part of can-next and will be included in the next pull request to David. regards, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
