Remove old mergedfb includes and defines, which bother spatch.

(cherry picked from commit c1dde7ac06ce6470c74198b2560ee67d28fb0aea)

1 files changed, 0 insertions, 6 deletions

diff --git a/src/i830.h b/src/i830.h
index 8ad5c698..dd5555d6 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -107,12 +107,6 @@ typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
 #include "i830_sdvo.h"
 #include "i2c_vid.h"
 
-/* I830 Video support */
-#define NEED_REPLIES				/* ? */
-#define EXTENSION_PROC_ARGS void *
-#include "extnsionst.h" 			/* required */
-#include <X11/extensions/panoramiXproto.h> 	/* required */
-
 /*
  * The mode handling is based upon the VESA driver written by
  * Paulo César Pereira de Andrade <pcpa@conectiva.com.br>.