Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11...

[platform/kernel/linux-starfive.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 3c001fb..20625ee 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1111,7 +1111,8 @@ struct class block_class = {
        .name           = "block",
 };
 
-static char *block_devnode(struct device *dev, umode_t *mode)
+static char *block_devnode(struct device *dev, umode_t *mode,
+                          kuid_t *uid, kgid_t *gid)
 {
        struct gendisk *disk = dev_to_disk(dev);