diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 18:21:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 18:21:33 +1000 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/char/drm/drm_proc.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
| download | linux-3.10-312f5726055534be1dc9dd369be13aabd2943fcb.tar.gz linux-3.10-312f5726055534be1dc9dd369be13aabd2943fcb.tar.bz2 linux-3.10-312f5726055534be1dc9dd369be13aabd2943fcb.zip | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/char/drm/drm_proc.c')
| -rw-r--r-- | drivers/char/drm/drm_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c index 8ec2156b97a..3f452f763f0 100644 --- 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; |