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.
> ---
> drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +-
> drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> --- lnx-36-rc4.orig/drivers/net/can/usb/peak_usb/pcan_usb_core.c
> +++ lnx-36-rc4/drivers/net/can/usb/peak_usb/pcan_usb_core.c
> @@ -53,7 +53,7 @@ static struct peak_usb_adapter *peak_usb
> * dump memory
> */
> #define DUMP_WIDTH 16
> -void dump_mem(char *prompt, void *p, int l)
> +void pcan_dump_mem(char *prompt, void *p, int l)
> {
> pr_info("%s dumping %s (%d bytes):\n",
> PCAN_USB_DRIVER_NAME, prompt ? prompt : "memory", l);
> --- lnx-36-rc4.orig/drivers/net/can/usb/peak_usb/pcan_usb_core.h
> +++ lnx-36-rc4/drivers/net/can/usb/peak_usb/pcan_usb_core.h
> @@ -131,7 +131,7 @@ struct peak_usb_device {
> struct peak_usb_device *next_siblings;
> };
>
> -void dump_mem(char *prompt, void *p, int l);
> +void pcan_dump_mem(char *prompt, void *p, int l);
>
> /* common timestamp management */
> void peak_usb_init_time_ref(struct peak_time_ref *time_ref,
>
--
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
