Merge ../linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / block / ub.c

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 19c5e59bcfa826966d433c2edd6f921592a7f40f..685f061e69b2971484a9546de5f3e32cc7b32801 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -430,7 +430,7 @@ static void ub_cmdtr_sense(struct ub_dev *sc, struct ub_scsi_cmd *cmd,
        }
 }
 
-static ssize_t ub_diag_show(struct device *dev, char *page)
+static ssize_t ub_diag_show(struct device *dev, struct device_attribute *attr, char *page)
 {
        struct usb_interface *intf;
        struct ub_dev *sc;