diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-03-06 05:26:23 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-03-06 05:26:23 +1000 |
| commit | e00dea812ddb9b483de9f58f7a7aa7105427512d (patch) | |
| tree | 9ffef663b16a3c444ea9a294d635be4e81e6fe99 /linux-core/drmP.h | |
| parent | f78cdac8e512642db1aaf09bf9178e23ede25586 (diff) | |
| parent | 12574590cdf7871755d1939463ca6898251fd0d1 (diff) | |
Merge branch 'master' of ../../drm into modesetting-101
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_proc.c
linux-core/drm_stub.c
linux-core/drm_sysfs.c
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 1a0a5659..47974856 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -761,9 +761,10 @@ struct drm_driver { }; #define DRM_MINOR_UNASSIGNED 0 -#define DRM_MINOR_CONTROL 1 -#define DRM_MINOR_LEGACY 2 +#define DRM_MINOR_LEGACY 1 +#define DRM_MINOR_CONTROL 2 #define DRM_MINOR_RENDER 3 + /** * DRM minor structure. This structure represents a drm minor number. */ |