diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-01-07 22:29:53 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-07 22:29:53 -0500 |
| commit | e8d6d61586b84acfd66ec20142c9a850d2d11544 (patch) | |
| tree | 14d30092322a36772337bafa76c84b5ddb2d8c98 /include | |
| parent | a3a06cb6c207a5612fa9753e2453bbcb3f5a256d (diff) | |
| parent | 003e69f9862bcda89a75c27750efdbc17ac02945 (diff) | |
Merge remote branch 'korg/drm-radeon-testing' into drm-testing
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drm_mode.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 43009bc2e757..bc4fdf27bd2e 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h | |||
| @@ -160,6 +160,7 @@ struct drm_mode_get_encoder { | |||
| 160 | #define DRM_MODE_CONNECTOR_HDMIA 11 | 160 | #define DRM_MODE_CONNECTOR_HDMIA 11 |
| 161 | #define DRM_MODE_CONNECTOR_HDMIB 12 | 161 | #define DRM_MODE_CONNECTOR_HDMIB 12 |
| 162 | #define DRM_MODE_CONNECTOR_TV 13 | 162 | #define DRM_MODE_CONNECTOR_TV 13 |
| 163 | #define DRM_MODE_CONNECTOR_eDP 14 | ||
| 163 | 164 | ||
| 164 | struct drm_mode_get_connector { | 165 | struct drm_mode_get_connector { |
| 165 | 166 | ||