From d793b1232ec49f0dafca7656857fa8923b87997e Mon Sep 17 00:00:00 2001
From: Yani Ioannou <yani.ioannou@gmail.com>
Date: Thu, 23 Jun 2005 22:02:28 -0700
Subject: [PATCH] --- yaml --- r: 3080 b: refs/heads/master c:
 3e05d2b8d3dd34b0237f489e991ed081cb0bf007 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/message/i2o/bus-osm.c  | 2 +-
 trunk/drivers/message/i2o/exec-osm.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9cb1a45802bc..eda1a7a01d61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f52bdbe9fcf2453d402376e22de1eca6dfc96890
+refs/heads/master: 3e05d2b8d3dd34b0237f489e991ed081cb0bf007
diff --git a/trunk/drivers/message/i2o/bus-osm.c b/trunk/drivers/message/i2o/bus-osm.c
index d43c35894ae9..151b228e1cb3 100644
--- a/trunk/drivers/message/i2o/bus-osm.c
+++ b/trunk/drivers/message/i2o/bus-osm.c
@@ -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);
diff --git a/trunk/drivers/message/i2o/exec-osm.c b/trunk/drivers/message/i2o/exec-osm.c
index 1b7389876e70..bda2c62648ba 100644
--- a/trunk/drivers/message/i2o/exec-osm.c
+++ b/trunk/drivers/message/i2o/exec-osm.c
@@ -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;
@@ -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;