git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
[pandora-kernel.git]
/
net
/
bridge
/
br_sysfs_br.c
diff --git
a/net/bridge/br_sysfs_br.c
b/net/bridge/br_sysfs_br.c
index
dd321e3
..
486b8f3
100644
(file)
--- a/
net/bridge/br_sysfs_br.c
+++ b/
net/bridge/br_sysfs_br.c
@@
-659,7
+659,7
@@
static struct attribute_group bridge_group = {
*
* Returns the number of bytes read.
*/
-static ssize_t brforward_read(struct kobject *kobj,
+static ssize_t brforward_read(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{