projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
gadget
/
net2280.c
diff --git
a/drivers/usb/gadget/net2280.c
b/drivers/usb/gadget/net2280.c
index 33469cf5aec35af86933b39d3781a409ffc9f97c..e01862300169772d714a6ab24a4db9938825fd9d 100644
(file)
--- a/
drivers/usb/gadget/net2280.c
+++ b/
drivers/usb/gadget/net2280.c
@@
-1418,8
+1418,8
@@
show_function (struct device *_dev, struct device_attribute *attr, char *buf)
}
static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
}
static DEVICE_ATTR (function, S_IRUGO, show_function, NULL);
-static ssize_t
-
show_registers (struct device *_dev,
struct device_attribute *attr, char *buf)
+static ssize_t
net2280_show_registers(struct device *_dev,
+
struct device_attribute *attr, char *buf)
{
struct net2280 *dev;
char *next;
{
struct net2280 *dev;
char *next;
@@
-1571,7
+1571,7
@@
show_registers (struct device *_dev, struct device_attribute *attr, char *buf)
return PAGE_SIZE - size;
}
return PAGE_SIZE - size;
}
-static DEVICE_ATTR
(registers, S_IRUGO,
show_registers, NULL);
+static DEVICE_ATTR
(registers, S_IRUGO, net2280_
show_registers, NULL);
static ssize_t
show_queues (struct device *_dev, struct device_attribute *attr, char *buf)
static ssize_t
show_queues (struct device *_dev, struct device_attribute *attr, char *buf)