patch-2.4.0-test3 linux/drivers/video/matrox/matroxfb_base.h

• Lines: 21
• Date: Wed Jul 5 11:55:45 2000
• Orig file: v2.4.0-test2/linux/drivers/video/matrox/matroxfb_base.h
• Orig date: Sat Feb 26 22:31:51 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/video/matrox/matroxfb_base.h linux/drivers/video/matrox/matroxfb_base.h
@@ -56,10 +56,10 @@
 #include <video/fbcon-cfb24.h>
 #include <video/fbcon-cfb32.h>
 
-#if defined(CONFIG_FB_OF)
 #if defined(CONFIG_FB_COMPAT_XPMAC)
 #include <asm/vc_ioctl.h>
 #endif
+#if defined(CONFIG_PPC)
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <video/macmodes.h>
@@ -544,7 +544,7 @@
 		struct timer_list timer;
 			      } cursor;
 	struct { unsigned red, green, blue, transp; } palette[256];
-#if defined(CONFIG_FB_OF) && defined(CONFIG_FB_COMPAT_XPMAC)
+#if defined(CONFIG_FB_COMPAT_XPMAC)
 	char	matrox_name[32];
 #endif
 /* These ifdefs must be last! They differ for module & non-module compiles */