Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[karo-tx-linux.git] / include / drm / drmP.h

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index b092b5bcf22741130ccd6fd0d5cfbe29c0d97833..63d17ee9eb488c336ad55521f346dc1c2703c4c4 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1023,7 +1023,7 @@ struct drm_info_list {
 struct drm_info_node {
        struct list_head list;
        struct drm_minor *minor;
-       struct drm_info_list *info_ent;
+       const struct drm_info_list *info_ent;
        struct dentry *dent;
 };
 
@@ -1547,8 +1547,7 @@ extern struct idr drm_minors_idr;
 extern struct drm_local_map *drm_getsarea(struct drm_device *dev);
 
                                /* Proc support (drm_proc.h) */
-extern int drm_proc_init(struct drm_minor *minor, int minor_id,
-                        struct proc_dir_entry *root);
+extern int drm_proc_init(struct drm_minor *minor, struct proc_dir_entry *root);
 extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root);
 
                                /* Debugfs support */