diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
| commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
| tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /include/drm/via_drm.h | |
| parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
| parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/drm/via_drm.h')
| -rw-r--r-- | include/drm/via_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/via_drm.h b/include/drm/via_drm.h index 170786e5c2ff..fd11a5bd892d 100644 --- a/include/drm/via_drm.h +++ b/include/drm/via_drm.h | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #ifndef _VIA_DRM_H_ | 24 | #ifndef _VIA_DRM_H_ |
| 25 | #define _VIA_DRM_H_ | 25 | #define _VIA_DRM_H_ |
| 26 | 26 | ||
| 27 | #include <linux/types.h> | 27 | #include "drm.h" |
| 28 | 28 | ||
| 29 | /* WARNING: These defines must be the same as what the Xserver uses. | 29 | /* WARNING: These defines must be the same as what the Xserver uses. |
| 30 | * if you change them, you must change the defines in the Xserver. | 30 | * if you change them, you must change the defines in the Xserver. |