From ce016335ab8ff2413bb82de6f74b2b96f746d07b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 9 Sep 2009 14:16:37 +0000
Subject: Synchronised with released branch.

---
 xorg-server/hw/kdrive/fake/fakeinit.c | 14 --------------
 xorg-server/hw/kdrive/sdl/sdl.c       | 11 -----------
 2 files changed, 25 deletions(-)

(limited to 'xorg-server/hw')

diff --git a/xorg-server/hw/kdrive/fake/fakeinit.c b/xorg-server/hw/kdrive/fake/fakeinit.c
index 9e8372eee..2cfcbedd5 100644
--- a/xorg-server/hw/kdrive/fake/fakeinit.c
+++ b/xorg-server/hw/kdrive/fake/fakeinit.c
@@ -72,26 +72,12 @@ ddxProcessArgument (int argc, char **argv, int i)
     return KdProcessArgument (argc, argv, i);
 }
 
-#ifdef DDXBEFORERESET
-void
-ddxBeforeReset (void)
-{
-}
-#endif
-
 void
 OsVendorInit (void)
 {
     KdOsInit (&FakeOsFuncs);
 }
 
-#ifdef DDXOSFATALERROR
-void
-OsVendorFatalError(void)
-{
-}
-#endif
-
 KdCardFuncs	fakeFuncs = {
     fakeCardInit,	    /* cardinit */
     fakeScreenInit,	    /* scrinit */
diff --git a/xorg-server/hw/kdrive/sdl/sdl.c b/xorg-server/hw/kdrive/sdl/sdl.c
index bd8106a27..411b5d4e1 100644
--- a/xorg-server/hw/kdrive/sdl/sdl.c
+++ b/xorg-server/hw/kdrive/sdl/sdl.c
@@ -369,12 +369,6 @@ int ddxProcessArgument(int argc, char **argv, int i)
 	return KdProcessArgument(argc, argv, i);
 }
 
-#ifdef DDXBEFORERESET
-void ddxBeforeReset (void)
-{
-}
-#endif
-
 void sdlTimer(void)
 {
 	static int buttonState=0;
@@ -458,9 +452,4 @@ void OsVendorInit (void)
     KdOsInit (&sdlOsFuncs);
 }
 
-#ifdef DDXOSFATALERROR
-void OsVendorFatalError(void)
-{
-}
-#endif
 
-- 
cgit v1.2.3