Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block

[~andy/linux] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index 167d586cece6e110ae7a0f39bc475c95643f7dd4..4cf703fd98bb8916fe74ae3b42d4856958d57950 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1068,7 +1068,7 @@ EXPORT_SYMBOL_GPL(bsg_register_queue);
 
 static struct cdev bsg_cdev;
 
-static char *bsg_devnode(struct device *dev, mode_t *mode)
+static char *bsg_devnode(struct device *dev, umode_t *mode)
 {
        return kasprintf(GFP_KERNEL, "bsg/%s", dev_name(dev));
 }