Merge remote-tracking branch 'origin' into spi/next

[pandora-kernel.git] / drivers / video / via / chip.h

diff --git a/drivers/video/via/chip.h b/drivers/video/via/chip.h
index 48f1342..781f3aa 100644 (file)
--- a/drivers/video/via/chip.h
+++ b/drivers/video/via/chip.h
@@ -110,16 +110,13 @@
 struct tmds_chip_information {
        int tmds_chip_name;
        int tmds_chip_slave_addr;
-       int data_mode;
        int output_interface;
        int i2c_port;
-       int device_type;
 };
 
 struct lvds_chip_information {
        int lvds_chip_name;
        int lvds_chip_slave_addr;
-       int data_mode;
        int output_interface;
        int i2c_port;
 };
@@ -142,9 +139,6 @@ struct chip_information {
 
 struct crt_setting_information {
        int iga_path;
-       int h_active;
-       int v_active;
-       int bpp;
        int refresh_rate;
 };
 
@@ -162,8 +156,6 @@ struct lvds_setting_information {
        int h_active;
        int v_active;
        int bpp;
-       int refresh_rate;
-       int lcd_panel_id;
        int lcd_panel_hres;
        int lcd_panel_vres;
        int display_method;
@@ -188,7 +180,6 @@ struct GFX_DPA_SETTING {
 };
 
 struct VT1636_DPA_SETTING {
-       int PanelSizeID;
        u8 CLK_SEL_ST1;
        u8 CLK_SEL_ST2;
 };