Merge tag 'v3.3-rc1' into staging/for_v3.3

[mv-sheeva.git] / drivers / media / dvb / ddbridge / ddbridge-core.c

diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
index 243dbb37bd5a8853581129d4976cfbef1d3698f5..d88c4aa7d24dcbe70915a7c8be29c35cc0d6f62c 100644 (file)
--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
@@ -1481,7 +1481,7 @@ static const struct file_operations ddb_fops = {
        .open           = ddb_open,
 };
 
-static char *ddb_devnode(struct device *device, mode_t *mode)
+static char *ddb_devnode(struct device *device, umode_t *mode)
 {
        struct ddb *dev = dev_get_drvdata(device);