Index: 2005-12-16/drivers/xen/blkback/xenbus.c
===================================================================
--- 2005-12-16.orig/drivers/xen/blkback/xenbus.c	2005-12-16 15:38:28.000000000 +0100
+++ 2005-12-16/drivers/xen/blkback/xenbus.c	2005-12-20 14:09:40.516755088 +0100
@@ -61,7 +61,8 @@ void update_blkif_status(blkif_t *blkif)
 }
 
 
-static ssize_t show_physical_device(struct device *_dev, char *buf)
+static ssize_t show_physical_device(struct device *_dev,
+                                    struct device_attribute *attr, char *buf)
 {
 	struct xenbus_device *dev = to_xenbus_device(_dev);
 	struct backend_info *be = dev->data;
@@ -71,7 +72,8 @@ DEVICE_ATTR(physical_device, S_IRUSR | S
 	    show_physical_device, NULL);
 
 
-static ssize_t show_mode(struct device *_dev, char *buf)
+static ssize_t show_mode(struct device *_dev,
+                        struct device_attribute *attr, char *buf)
 {
 	struct xenbus_device *dev = to_xenbus_device(_dev);
 	struct backend_info *be = dev->data;