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]
/
arch
/
mips
/
txx9
/
generic
/
setup.c
diff --git
a/arch/mips/txx9/generic/setup.c
b/arch/mips/txx9/generic/setup.c
index
adc6929
..
575d219
100644
(file)
--- a/
arch/mips/txx9/generic/setup.c
+++ b/
arch/mips/txx9/generic/setup.c
@@
-905,7
+905,7
@@
struct txx9_sramc_sysdev {
void __iomem *base;
};
void __iomem *base;
};
-static ssize_t txx9_sram_read(struct kobject *kobj,
+static ssize_t txx9_sram_read(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{
@@
-920,7
+920,7
@@
static ssize_t txx9_sram_read(struct kobject *kobj,
return size;
}
return size;
}
-static ssize_t txx9_sram_write(struct kobject *kobj,
+static ssize_t txx9_sram_write(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{
struct bin_attribute *bin_attr,
char *buf, loff_t pos, size_t size)
{