diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:49:07 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:49:07 -0800 |
commit | d8762748cae4f85b3201c0304969d993b42d5258 (patch) | |
tree | 559819d9b17e5ee305d705cf9f31ac5de2aab54a /drivers/char/drm/sis_drm.h | |
parent | ce4633704038f9bf39f20c10691747d6fc127bf4 (diff) | |
parent | a4e62fa031a9681477207b08391c3a5c5c831ce7 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Manual fixups for some clashes due to re-indenting.
Diffstat (limited to 'drivers/char/drm/sis_drm.h')
-rw-r--r-- | drivers/char/drm/sis_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/sis_drm.h b/drivers/char/drm/sis_drm.h index e99c3a43abb..8f273da76dd 100644 --- a/drivers/char/drm/sis_drm.h +++ b/drivers/char/drm/sis_drm.h @@ -39,4 +39,4 @@ typedef struct { unsigned int offset, size; } drm_sis_fb_t; -#endif /* __SIS_DRM_H__ */ +#endif /* __SIS_DRM_H__ */ |