Automatic merge with /usr/src/ntfs-2.6.git.

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

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index adc4dcc306f4225f850c24cfe4916e60b2b6f372..685f061e69b2971484a9546de5f3e32cc7b32801 100644 (file)
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -51,7 +51,7 @@
  * This many LUNs per USB device.
  * Every one of them takes a host, see UB_MAX_HOSTS.
  */
-#define UB_MAX_LUNS   4
+#define UB_MAX_LUNS   9
 
 /*
  */
@@ -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;
@@ -2100,7 +2100,7 @@ static int ub_probe(struct usb_interface *intf,
                        nluns = rc;
                        break;
                }
-               mdelay(100);
+               msleep(100);
        }
 
        for (i = 0; i < nluns; i++) {