merge Linus head tree into my drm tree and fix up conflicts

[linux-2.6-omap-h63xx.git] / drivers / char / drm / drm_proc.c

diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 8ec2156b97a9ec8b0d3cc60191d361650d51457d..3f452f763f0fa27d00b7119e170f7b0501534e8f 100644 (file)
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -97,7 +97,7 @@ int drm_proc_init(drm_device_t * dev, int minor,
        char name[64];
 
        sprintf(name, "%d", minor);
-       *dev_root = create_proc_entry(name, S_IFDIR, root);
+       *dev_root = proc_mkdir(name, root);
        if (!*dev_root) {
                DRM_ERROR("Cannot create /proc/dri/%s\n", name);
                return -1;