projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
merge Linus head tree into my drm tree and fix up conflicts
[linux-2.6-block.git]
/
drivers
/
char
/
drm
/
drm_drv.c
diff --git
a/drivers/char/drm/drm_drv.c
b/drivers/char/drm/drm_drv.c
index 26733248ff4a3bbece18fcba97ad742eb8c44ba4..4dff7554eb083e5f4b5a41b19db41ba3014db3e9 100644
(file)
--- a/
drivers/char/drm/drm_drv.c
+++ b/
drivers/char/drm/drm_drv.c
@@
-382,7
+382,7
@@
static int __init drm_core_init(void)
goto err_p2;
}
- drm_proc_root =
create_proc_entry("dri", S_IFDIR
, NULL);
+ drm_proc_root =
proc_mkdir("dri"
, NULL);
if (!drm_proc_root) {
DRM_ERROR("Cannot create /proc/dri\n");
ret = -1;