diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2012-09-02 21:13:11 +0400 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-09-22 01:58:48 +0400 |
| commit | 56b9f30198875f199d00554c5e5001f63c5fc8ad (patch) | |
| tree | 9cf3087f6c374c5a9d06c2e919aa992af9c83d8d /drivers/net/can/mscan | |
| parent | 006cd138fc8813220cb4b6450bd9b44f3401bb89 (diff) | |
| download | linux-56b9f30198875f199d00554c5e5001f63c5fc8ad.tar.xz | |
can: usb: peak: rename peak_usb dump_mem function
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
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Stephane Grosjean <s.grosjean@peak-system.com>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
[mkl: convert all users of dump_mem(), too]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/mscan')
0 files changed, 0 insertions, 0 deletions