summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2008-03-07 08:49:27 +1000
committerDave Airlie <airlied@redhat.com>2008-03-07 08:49:27 +1000
commit48a166af14d7455835b9dc2ffd831347d18635d2 (patch)
treeb8b147a70c8f99d152ad237c09ecafd7ead46b52
parentfef1c93aa87a1ccbc473749a7e42557fc90a1fca (diff)
woah somehow got these upstream
-rw-r--r--shared-core/drm.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 753af6b7..6b3c6229 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -1052,7 +1052,6 @@ struct drm_mm_info_arg {
#define DRM_IOCTL_BO_WAIT_IDLE DRM_IOWR(0xd5, struct drm_bo_map_wait_idle_arg)
#define DRM_IOCTL_BO_VERSION DRM_IOR(0xd6, struct drm_bo_version_arg)
#define DRM_IOCTL_MM_INFO DRM_IOWR(0xd7, struct drm_mm_info_arg)
-<<<<<<< HEAD:shared-core/drm.h
#define DRM_IOCTL_MODE_GETRESOURCES DRM_IOWR(0xA0, struct drm_mode_card_res)
#define DRM_IOCTL_MODE_GETCRTC DRM_IOWR(0xA1, struct drm_mode_crtc)
@@ -1070,8 +1069,6 @@ struct drm_mm_info_arg {
#define DRM_IOCTL_MODE_GETPROPERTY DRM_IOWR(0xAB, struct drm_mode_get_property)
#define DRM_IOCTL_MODE_CURSOR DRM_IOWR(0xAC, struct drm_mode_cursor)
#define DRM_IOCTL_MODE_HOTPLUG DRM_IOWR(0xAD, struct drm_mode_hotplug)
-=======
->>>>>>> d5c0101252e9f48ef1b59f48c05fea7007df97f0:shared-core/drm.h
/*@}*/