Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / include / media / media-device.h

diff --git a/include/media/media-device.h b/include/media/media-device.h
index 12155a9596c49c89350f1cdadbe6f1f301e27d10..6e6db78f1ee2d18bca17959bc1f0503cf28f5d88 100644 (file)
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -87,7 +87,9 @@ struct media_device {
 /* media_devnode to media_device */
 #define to_media_device(node) container_of(node, struct media_device, devnode)
 
-int __must_check media_device_register(struct media_device *mdev);
+int __must_check __media_device_register(struct media_device *mdev,
+                                        struct module *owner);
+#define media_device_register(mdev) __media_device_register(mdev, THIS_MODULE)
 void media_device_unregister(struct media_device *mdev);
 
 int __must_check media_device_register_entity(struct media_device *mdev,