diff --git a/src/mga_2064_output.c b/src/mga_2064_output.c
index e344b6a..4160121 100644
--- a/src/mga_2064_output.c
+++ b/src/mga_2064_output.c
@@ -44,6 +44,8 @@ typedef struct {
 } MgaOutputDataRec, *MgaOutputDataPtr;
 
 static void output_dpms(xf86OutputPtr output, int mode);
+static void output_save(xf86OutputPtr output);
+static void output_restore(xf86OutputPtr output);
 static int output_mode_valid(xf86OutputPtr output, DisplayModePtr mode);
 static int output_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
                              DisplayModePtr adjusted_mode);
@@ -57,6 +59,8 @@ static void output_destroy(xf86OutputPtr output);
 
 static const xf86OutputFuncsRec output_funcs = {
     .dpms = output_dpms,
+    .save = output_save,
+    .restore = output_restore,
     .mode_valid = output_mode_valid,
     .mode_fixup = output_mode_fixup,
     .prepare = output_prepare,
@@ -111,6 +115,16 @@ output_dpms(xf86OutputPtr output, int mode)
     OUTREG8(MGAREG_CRTCEXT_DATA, crtcext1);
 }
 
+static void
+output_save(xf86OutputPtr output)
+{
+}
+
+static void
+output_restore(xf86OutputPtr output)
+{
+}
+
 static int
 output_mode_valid(xf86OutputPtr output, DisplayModePtr mode)
 {
--- mga_2064_crtc.c.orig	Mon Oct 15 17:02:20 2007
+++ mga_2064_crtc.c	Mon Oct 15 17:02:25 2007
@@ -73,6 +73,11 @@
 static void crtc_dpms(xf86CrtcPtr crtc, int mode);
 static void crtc_save(xf86CrtcPtr crtc);
 static void crtc_restore(xf86CrtcPtr crtc);
+static void crtc_lock(xf86CrtcPtr crtc);
+static void crtc_unlock(xf86CrtcPtr crtc);
+static void crtc_mode_fixup(xf86CrtcPtr crtc, DisplayModePtr mode,
+                          DisplayModePtr adjusted_mode);
+
 static void crtc_prepare(xf86CrtcPtr crtc);
 static void crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
                           DisplayModePtr adjusted_mode, int x, int y);
@@ -83,8 +88,11 @@
     .dpms = crtc_dpms,
     .save = crtc_save,
     .restore = crtc_restore,
+    .lock = crtc_lock,
+    .unlock = crtc_unlock,
     .prepare = crtc_prepare,
     .mode_set = crtc_mode_set,
+    .mode_fixup = crtc_mode_fixup,
     .commit = crtc_commit,
     .destroy = crtc_destroy
 };
@@ -897,6 +905,16 @@
 }
 
 static void
+crtc_lock(xf86CrtcPtr crtc)
+{
+}
+
+static void
+crtc_unlock(xf86CrtcPtr crtc)
+{
+}
+
+static void
 crtc_prepare(xf86CrtcPtr crtc)
 {
     crtc->funcs->dpms(crtc, DPMSModeOff);
@@ -913,6 +931,12 @@
 
     state_set(crtc, &state, mode);
     state_restore(crtc, &state, &vga->ModeReg, VGA_SR_MODE);
+}
+
+static void 
+crtc_mode_fixup(xf86CrtcPtr crtc, DisplayModePtr mode,
+		DisplayModePtr adjust_mode)
+{
 }
 
 static void