diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-20 13:11:02 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-20 13:11:02 +0800 |
| commit | fe4cc50983bdaf51bf29ef041f65e0007f547844 (patch) | |
| tree | f92f233efb08d7fcae8181553ecda8def4ad2e31 /linux-core/drm_drv.c | |
| parent | 8398b99d8d146278adc13d6093811e53cd42c88a (diff) | |
| parent | 209870a88262a4a27b36e5cc97f3b1e7021dbefd (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'linux-core/drm_drv.c')
| -rw-r--r-- | linux-core/drm_drv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index bfa39ab7..b95f796f 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -15,8 +15,6 @@ * #define DRIVER_DESC "Matrox G200/G400" * #define DRIVER_DATE "20001127" * - * #define DRIVER_IOCTL_COUNT DRM_ARRAY_SIZE( mga_ioctls ) - * * #define drm_x mga_##x * \endcode */ @@ -127,7 +125,7 @@ static drm_ioctl_desc_t drm_ioctls[] = { [DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW)] = {drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY}, }; -#define DRIVER_IOCTL_COUNT ARRAY_SIZE( drm_ioctls ) +#define DRM_CORE_IOCTL_COUNT ARRAY_SIZE( drm_ioctls ) /** @@ -591,7 +589,7 @@ int drm_ioctl(struct inode *inode, struct file *filp, current->pid, cmd, nr, (long)old_encode_dev(priv->head->device), priv->authenticated); - if ((nr >= DRIVER_IOCTL_COUNT) && + if ((nr >= DRM_CORE_IOCTL_COUNT) && ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END))) goto err_i1; if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END) |