fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

[safe/jmp/linux-2.6] / drivers / video / valkyriefb.h

diff --git a/drivers/video/valkyriefb.h b/drivers/video/valkyriefb.h
index 97aaf7b..d787441 100644 (file)
--- a/drivers/video/valkyriefb.h
+++ b/drivers/video/valkyriefb.h
@@ -134,15 +134,7 @@ static struct valkyrie_regvals valkyrie_reg_init_14 = {
     { 1024, 0 },
        1024, 768
 };
-
-/* Register values for 800x600, 72Hz mode (11) */
-static struct valkyrie_regvals valkyrie_reg_init_11 = {
-    13,
-    { 17, 27, 3 },  /* pixel clock = 49.63MHz for V=71.66Hz */
-    { 800, 0 },
-       800, 600
-};
-#endif /* CONFIG_MAC */
+#endif /* !defined CONFIG_MAC */
 
 /* Register values for 832x624, 75Hz mode (13) */
 static struct valkyrie_regvals valkyrie_reg_init_13 = {
@@ -152,6 +144,14 @@ static struct valkyrie_regvals valkyrie_reg_init_13 = {
        832, 624
 };
 
+/* Register values for 800x600, 72Hz mode (11) */
+static struct valkyrie_regvals valkyrie_reg_init_11 = {
+    13,
+    { 17, 27, 3 },  /* pixel clock = 49.63MHz for V=71.66Hz */
+    { 800, 0 },
+       800, 600
+};
+
 /* Register values for 800x600, 60Hz mode (10) */
 static struct valkyrie_regvals valkyrie_reg_init_10 = {
     12,
@@ -188,24 +188,13 @@ static struct valkyrie_regvals *valkyrie_reg_init[VMODE_MAX] = {
        NULL,
        NULL,
        &valkyrie_reg_init_10,
-#ifdef CONFIG_MAC
-       NULL,
-       NULL,
-       &valkyrie_reg_init_13,
-       NULL,
-       NULL,
-       NULL,
-       NULL,
-#else
        &valkyrie_reg_init_11,
        NULL,
        &valkyrie_reg_init_13,
+#ifndef CONFIG_MAC
        &valkyrie_reg_init_14,
        &valkyrie_reg_init_15,
        NULL,
        &valkyrie_reg_init_17,
 #endif
-       NULL,
-       NULL,
-       NULL
 };