patch-2.3.99-pre7 linux/drivers/video/macmodes.c

• Lines: 84
• Date: Wed May 3 01:47:57 2000
• Orig file: v2.3.99-pre6/linux/drivers/video/macmodes.c
• Orig date: Mon Mar 27 08:08:28 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/video/macmodes.c linux/drivers/video/macmodes.c
@@ -12,6 +12,7 @@
  *  more details.
  */
 
+#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/fb.h>
 #include <linux/string.h>
@@ -188,8 +189,10 @@
     { -1,    VMODE_640_480_60 },	/* catch-all, must be last */
 };
 
+#ifdef CONFIG_FB_COMPAT_XPMAC
 struct fb_info *console_fb_info = NULL;
 struct vc_mode display_info;
+
 static u16 palette_red[16];
 static u16 palette_green[16];
 static u16 palette_blue[16];
@@ -198,20 +201,12 @@
 };
 
 
-int console_getmode(struct vc_mode *);
-int console_setmode(struct vc_mode *, int);
-int console_setcmap(int, unsigned char *, unsigned char *, unsigned char *);
-int console_powermode(int);
-int mac_var_to_vmode(const struct fb_var_screeninfo *, int *, int *);
-
-
 int console_getmode(struct vc_mode *mode)
 {
     *mode = display_info;
     return 0;
 }
 
-
 int console_setmode(struct vc_mode *mode, int doit)
 {
     struct fb_var_screeninfo var;
@@ -258,7 +253,6 @@
     return 0;
 }
 
-
 int console_setcmap(int n_entries, unsigned char *red, unsigned char *green,
                     unsigned char *blue)
 {
@@ -289,6 +283,17 @@
     return 0;
 }
 
+int console_powermode(int mode)
+{
+    if (mode == VC_POWERMODE_INQUIRY)
+        return 0;
+    if (mode < VESA_NO_BLANKING || mode > VESA_POWERDOWN)
+        return -EINVAL;
+    /* Not Supported */
+    return -ENXIO;
+}
+#endif /* CONFIG_FB_COMPAT_XPMAC */
+
 
     /*
      *  Convert a MacOS vmode/cmode pair to a frame buffer video mode structure
@@ -360,17 +365,6 @@
     var->sync = mode->sync;
     var->vmode = mode->vmode;
     return 0;
-}
-
-
-int console_powermode(int mode)
-{
-    if (mode == VC_POWERMODE_INQUIRY)
-        return 0;
-    if (mode < VESA_NO_BLANKING || mode > VESA_POWERDOWN)
-        return -EINVAL;
-    /* Not Supported */
-    return -ENXIO;
 }