summaryrefslogtreecommitdiffstats
path: root/drivers/staging/gdm724x
diff options
context:
space:
mode:
authorWon Kang <wkang77@gmail.com>2013-07-27 15:42:18 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-29 11:29:37 -0700
commit9c02d0dbdefdb8953f6bce698bcce651a13f3a19 (patch)
tree6c827ae651adefc4b8fa1aae23b3747057dbe9ed /drivers/staging/gdm724x
parenta66b0f039cddfd01152eb773c4f60b246f612516 (diff)
downloadlinux-9c02d0dbdefdb8953f6bce698bcce651a13f3a19.tar.bz2
staging: gdm724x: Modified function name conflict set_endian
Conflict resolution for function name set_endian when building for powerpc The name changed to gdm_set_endian Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Won Kang <wonkang@gctsemi.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gdm724x')
-rw-r--r--drivers/staging/gdm724x/gdm_endian.c2
-rw-r--r--drivers/staging/gdm724x/gdm_endian.h2
-rw-r--r--drivers/staging/gdm724x/gdm_usb.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/gdm724x/gdm_endian.c b/drivers/staging/gdm724x/gdm_endian.c
index 02934093ce7f..f6cc90ae9ba6 100644
--- a/drivers/staging/gdm724x/gdm_endian.c
+++ b/drivers/staging/gdm724x/gdm_endian.c
@@ -14,7 +14,7 @@
#include <linux/slab.h>
#include "gdm_endian.h"
-void set_endian(struct gdm_endian *ed, u8 dev_endian)
+void gdm_set_endian(struct gdm_endian *ed, u8 dev_endian)
{
u8 a[2] = {0x12, 0x34};
u8 b[2] = {0, };
diff --git a/drivers/staging/gdm724x/gdm_endian.h b/drivers/staging/gdm724x/gdm_endian.h
index 775794db6ab6..9b2531ff908e 100644
--- a/drivers/staging/gdm724x/gdm_endian.h
+++ b/drivers/staging/gdm724x/gdm_endian.h
@@ -40,7 +40,7 @@ struct gdm_endian {
u8 host_ed;
};
-void set_endian(struct gdm_endian *ed, u8 dev_endian);
+void gdm_set_endian(struct gdm_endian *ed, u8 dev_endian);
u16 gdm_cpu_to_dev16(struct gdm_endian *ed, u16 x);
u16 gdm_dev16_to_cpu(struct gdm_endian *ed, u16 x);
u32 gdm_cpu_to_dev32(struct gdm_endian *ed, u32 x);
diff --git a/drivers/staging/gdm724x/gdm_usb.c b/drivers/staging/gdm724x/gdm_usb.c
index 4b10f23845ad..bdc96370e430 100644
--- a/drivers/staging/gdm724x/gdm_usb.c
+++ b/drivers/staging/gdm724x/gdm_usb.c
@@ -870,9 +870,9 @@ static int gdm_usb_probe(struct usb_interface *intf, const struct usb_device_id
/* List up hosts with big endians, otherwise, defaults to little endian */
if (idProduct == PID_GDM7243)
- set_endian(&udev->gdm_ed, ENDIANNESS_BIG);
+ gdm_set_endian(&udev->gdm_ed, ENDIANNESS_BIG);
else
- set_endian(&udev->gdm_ed, ENDIANNESS_LITTLE);
+ gdm_set_endian(&udev->gdm_ed, ENDIANNESS_LITTLE);
ret = request_mac_address(udev);
if (ret < 0) {