Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3080
b: refs/heads/master
c: 3e05d2b
h: refs/heads/master
v: v3
  • Loading branch information
Yani Ioannou authored and Linus Torvalds committed Jun 24, 2005
1 parent 7c25d8e commit d793b12
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f52bdbe9fcf2453d402376e22de1eca6dfc96890
refs/heads/master: 3e05d2b8d3dd34b0237f489e991ed081cb0bf007
2 changes: 1 addition & 1 deletion trunk/drivers/message/i2o/bus-osm.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static int i2o_bus_scan(struct i2o_device *dev)
*
* Returns count.
*/
static ssize_t i2o_bus_store_scan(struct device *d, const char *buf,
static ssize_t i2o_bus_store_scan(struct device *d, struct device_attribute *attr, const char *buf,
size_t count)
{
struct i2o_device *i2o_dev = to_i2o_device(d);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/message/i2o/exec-osm.c
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ static int i2o_msg_post_wait_complete(struct i2o_controller *c, u32 m,
*
* Returns number of bytes printed into buffer.
*/
static ssize_t i2o_exec_show_vendor_id(struct device *d, char *buf)
static ssize_t i2o_exec_show_vendor_id(struct device *d, struct device_attribute *attr, char *buf)
{
struct i2o_device *dev = to_i2o_device(d);
u16 id;
Expand All @@ -281,7 +281,7 @@ static ssize_t i2o_exec_show_vendor_id(struct device *d, char *buf)
*
* Returns number of bytes printed into buffer.
*/
static ssize_t i2o_exec_show_product_id(struct device *d, char *buf)
static ssize_t i2o_exec_show_product_id(struct device *d, struct device_attribute *attr, char *buf)
{
struct i2o_device *dev = to_i2o_device(d);
u16 id;
Expand Down

0 comments on commit d793b12

Please sign in to comment.