viafb: move some include files to include/linux

[pandora-kernel.git] / drivers / video / via / viafbdev.c

diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 70ed71f..d3dd2eb 100644 (file)
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -22,9 +22,9 @@
 #include <linux/module.h>
 #include <linux/seq_file.h>
 #include <linux/stat.h>
-#define _MASTER_FILE
+#include <linux/via-core.h>
 
-#include "via-core.h"
+#define _MASTER_FILE
 #include "global.h"
 
 static char *viafb_name = "Via";
@@ -317,12 +317,12 @@ static int viafb_pan_display(struct fb_var_screeninfo *var,
 
        DEBUG_MSG(KERN_DEBUG "viafb_pan_display, address = %d\n", vram_addr);
        if (!viafb_dual_fb) {
-               viafb_set_primary_address(vram_addr);
-               viafb_set_secondary_address(vram_addr);
+               via_set_primary_address(vram_addr);
+               via_set_secondary_address(vram_addr);
        } else if (viapar->iga_path == IGA1)
-               viafb_set_primary_address(vram_addr);
+               via_set_primary_address(vram_addr);
        else
-               viafb_set_secondary_address(vram_addr);
+               via_set_secondary_address(vram_addr);
 
        return 0;
 }
@@ -1018,8 +1018,8 @@ static void viafb_set_device(struct device_t active_dev)
                viafb_SAMM_ON = active_dev.samm;
        viafb_primary_dev = active_dev.primary_dev;
 
-       viafb_set_primary_address(0);
-       viafb_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
+       via_set_primary_address(0);
+       via_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
        viafb_set_iga_path();
 }
 
@@ -1165,8 +1165,9 @@ static int apply_device_setting(struct viafb_ioctl_setting setting_info,
                        if (viafb_SAMM_ON)
                                viafb_primary_dev = setting_info.primary_device;
 
-                       viafb_set_primary_address(0);
-                       viafb_set_secondary_address(viafb_SAMM_ON ? viafb_second_offset : 0);
+                       via_set_primary_address(0);
+                       via_set_secondary_address(viafb_SAMM_ON ?
+                               viafb_second_offset : 0);
                        viafb_set_iga_path();
                }
                need_set_mode = 1;
@@ -1325,6 +1326,8 @@ static void parse_dvi_port(void)
                  output_interface);
 }
 
+#ifdef CONFIG_FB_VIA_DIRECT_PROCFS
+
 /*
  * The proc filesystem read/write function, a simple proc implement to
  * get/set the value of DPA  DVP0,   DVP0DataDriving,  DVP0ClockDriving, DVP1,
@@ -1701,16 +1704,21 @@ static void viafb_init_proc(struct proc_dir_entry **viafb_entry)
 }
 static void viafb_remove_proc(struct proc_dir_entry *viafb_entry)
 {
-       /* no problem if it was not registered */
+       struct chip_information *chip_info = &viaparinfo->shared->chip_info;
+
        remove_proc_entry("dvp0", viafb_entry);/* parent dir */
        remove_proc_entry("dvp1", viafb_entry);
        remove_proc_entry("dfph", viafb_entry);
        remove_proc_entry("dfpl", viafb_entry);
-       remove_proc_entry("vt1636", viafb_entry);
-       remove_proc_entry("vt1625", viafb_entry);
+       if (chip_info->lvds_chip_info.lvds_chip_name == VT1636_LVDS
+               || chip_info->lvds_chip_info2.lvds_chip_name == VT1636_LVDS)
+               remove_proc_entry("vt1636", viafb_entry);
+
        remove_proc_entry("viafb", NULL);
 }
 
+#endif /* CONFIG_FB_VIA_DIRECT_PROCFS */
+
 static int parse_mode(const char *str, u32 *xres, u32 *yres)
 {
        char *ptr;
@@ -1939,7 +1947,9 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
                  viafbinfo->node, viafbinfo->fix.id, default_var.xres,
                  default_var.yres, default_var.bits_per_pixel);
 
+#ifdef CONFIG_FB_VIA_DIRECT_PROCFS
        viafb_init_proc(&viaparinfo->shared->proc_entry);
+#endif
        viafb_init_dac(IGA2);
        return 0;
 
@@ -1966,12 +1976,12 @@ void __devexit via_fb_pci_remove(struct pci_dev *pdev)
        unregister_framebuffer(viafbinfo);
        if (viafb_dual_fb)
                unregister_framebuffer(viafbinfo1);
-
+#ifdef CONFIG_FB_VIA_DIRECT_PROCFS
+       viafb_remove_proc(viaparinfo->shared->proc_entry);
+#endif
        framebuffer_release(viafbinfo);
        if (viafb_dual_fb)
                framebuffer_release(viafbinfo1);
-
-       viafb_remove_proc(viaparinfo->shared->proc_entry);
 }
 
 #ifndef MODULE