diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/char/drm/drm_stub.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/char/drm/drm_stub.c')
| -rw-r--r-- | drivers/char/drm/drm_stub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 7cb7234d6288..60b6f8e8bf69 100644 --- a/drivers/char/drm/drm_stub.c +++ b/drivers/char/drm/drm_stub.c | |||
| @@ -47,7 +47,7 @@ MODULE_PARM_DESC(cards_limit, "Maximum number of graphics cards"); | |||
| 47 | MODULE_PARM_DESC(debug, "Enable debug output"); | 47 | MODULE_PARM_DESC(debug, "Enable debug output"); |
| 48 | 48 | ||
| 49 | module_param_named(cards_limit, drm_cards_limit, int, 0444); | 49 | module_param_named(cards_limit, drm_cards_limit, int, 0444); |
| 50 | module_param_named(debug, drm_debug, int, 0666); | 50 | module_param_named(debug, drm_debug, int, 0600); |
| 51 | 51 | ||
| 52 | drm_head_t **drm_heads; | 52 | drm_head_t **drm_heads; |
| 53 | struct drm_sysfs_class *drm_class; | 53 | struct drm_sysfs_class *drm_class; |