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 git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
drivers
/
firmware
/
dell_rbu.c
diff --git
a/drivers/firmware/dell_rbu.c
b/drivers/firmware/dell_rbu.c
index
3a44602
..
2f452f1
100644
(file)
--- a/
drivers/firmware/dell_rbu.c
+++ b/
drivers/firmware/dell_rbu.c
@@
-522,7
+522,7
@@
static ssize_t read_rbu_mono_data(char *buffer, loff_t pos, size_t count)
rbu_data.image_update_buffer, rbu_data.bios_image_size);
}
rbu_data.image_update_buffer, rbu_data.bios_image_size);
}
-static ssize_t read_rbu_data(struct kobject *kobj,
+static ssize_t read_rbu_data(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
@@
-576,7
+576,7
@@
static void callbackfn_rbu(const struct firmware *fw, void *context)
release_firmware(fw);
}
release_firmware(fw);
}
-static ssize_t read_rbu_image_type(struct kobject *kobj,
+static ssize_t read_rbu_image_type(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
@@
-586,7
+586,7
@@
static ssize_t read_rbu_image_type(struct kobject *kobj,
return size;
}
return size;
}
-static ssize_t write_rbu_image_type(struct kobject *kobj,
+static ssize_t write_rbu_image_type(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
@@
-647,7
+647,7
@@
static ssize_t write_rbu_image_type(struct kobject *kobj,
return rc;
}
return rc;
}
-static ssize_t read_rbu_packet_size(struct kobject *kobj,
+static ssize_t read_rbu_packet_size(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
@@
-660,7
+660,7
@@
static ssize_t read_rbu_packet_size(struct kobject *kobj,
return size;
}
return size;
}
-static ssize_t write_rbu_packet_size(struct kobject *kobj,
+static ssize_t write_rbu_packet_size(struct
file *filp, struct
kobject *kobj,
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{
struct bin_attribute *bin_attr,
char *buffer, loff_t pos, size_t count)
{