diff options
| author | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-11-27 05:07:25 +0100 |
| commit | dd7c7c3f69291baa488b8a50db683d5fbf44166a (patch) | |
| tree | 925bf294f30dffaa67a983c3859926ff53937e14 /include/drm/drm_mode.h | |
| parent | UART: add CSR SiRFprimaII SoC on-chip uart drivers (diff) | |
| parent | Linux 3.2-rc3 (diff) | |
| download | kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.gz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.tar.xz kernel-qcow2-linux-dd7c7c3f69291baa488b8a50db683d5fbf44166a.zip | |
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/drm/drm_mode.h')
| -rw-r--r-- | include/drm/drm_mode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index d30bedfeb7ef..ddd46db65b57 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -235,6 +235,8 @@ struct drm_mode_fb_cmd { #define DRM_MODE_FB_DIRTY_ANNOTATE_FILL 0x02 #define DRM_MODE_FB_DIRTY_FLAGS 0x03 +#define DRM_MODE_FB_DIRTY_MAX_CLIPS 256 + /* * Mark a region of a framebuffer as dirty. * |