summaryrefslogtreecommitdiff
path: root/src/mga_merge.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-06-06 09:23:31 +0100
committerDave Airlie <airlied@redhat.com>2012-06-06 09:24:12 +0100
commit7b6dcc4d5768cc8d17a1f664155ebdc8ca8c042e (patch)
tree574af706343180d0cf5cea108d44cf4948b2e533 /src/mga_merge.h
parent0cb8ba6dc5e7bf4179174f9f17e211df7d89bd41 (diff)
mga: port to new compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mga_merge.h')
-rw-r--r--src/mga_merge.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mga_merge.h b/src/mga_merge.h
index f823b23..ecbb4b6 100644
--- a/src/mga_merge.h
+++ b/src/mga_merge.h
@@ -4,10 +4,10 @@
void MGADisplayPowerManagementSetMerged(ScrnInfoPtr pScrn,
int PowerManagementMode,
int flags);
-void MGAMergePointerMoved(int scrnIndex, int x, int y);
-void MGAAdjustMergeFrames(int scrnIndex, int x, int y, int flags);
+void MGAMergePointerMoved(SCRN_ARG_TYPE arg, int x, int y);
+void MGAAdjustMergeFrames(ADJUST_FRAME_ARGS_DECL);
Bool MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags);
-Bool MGACloseScreenMerged(int scrnIndex, ScreenPtr pScreen);
+Bool MGACloseScreenMerged(ScreenPtr pScreen);
Bool MGASaveScreenMerged(ScreenPtr pScreen, int mode);
typedef struct _MergedDisplayModeRec {