diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:24:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:24:07 -0700 |
| commit | 5f757f91e70a97eda8f0cc13bddc853209b2d173 (patch) | |
| tree | e2e97796f5145b5d6eb3fee6ec93050d90f2bd7d /drivers/char/drm/drm.h | |
| parent | 9fa0853a85a3a4067e4ad0aaa5d90984c2dd21b5 (diff) | |
| parent | ce7dd06372058f9e3e57ee4c0aeba694a43a80ad (diff) | |
| download | kernel_goldelico_gta04-5f757f91e70a97eda8f0cc13bddc853209b2d173.zip kernel_goldelico_gta04-5f757f91e70a97eda8f0cc13bddc853209b2d173.tar.gz kernel_goldelico_gta04-5f757f91e70a97eda8f0cc13bddc853209b2d173.tar.bz2 | |
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Add 965GM pci id update
drm: just use io_remap_pfn_range on all archs..
drm: fix DRM_CONSISTENT mapping
drm: fix up mmap locking in preparation for ttm changes
drm: fix driver deadlock with AIGLX and reclaim_buffers_locked
drm: fix warning in drm_fops.c
drm: allow for more generic drm ioctls
drm: fix alpha domain handling
via: fix CX700 pci id
drm: make drm_io_prot static.
drm: remove via_mm.h
drm: add missing NULL assignment
drm/radeon: Fix u32 overflows when determining AGP base address in card space.
drm: port over use_vmalloc code from git hashtab
drm: fix crash with fops lock and fixup sarea/page size locking
drm: bring bufs code from git tree.
drm: move protection stuff into separate function
drm: Use ARRAY_SIZE macro when appropriate
drm: update README.drm (bugzilla #7933)
drm: remove unused exports
Diffstat (limited to 'drivers/char/drm/drm.h')
| -rw-r--r-- | drivers/char/drm/drm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 8db9041..0891984 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h @@ -654,11 +654,13 @@ typedef struct drm_set_version { /** * Device specific ioctls should only be in their respective headers - * The device specific ioctl range is from 0x40 to 0x79. + * The device specific ioctl range is from 0x40 to 0x99. + * Generic IOCTLS restart at 0xA0. * * \sa drmCommandNone(), drmCommandRead(), drmCommandWrite(), and * drmCommandReadWrite(). */ #define DRM_COMMAND_BASE 0x40 +#define DRM_COMMAND_END 0xA0 #endif |