Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / drivers / video / nvidia / nv_type.h

diff --git a/drivers/video/nvidia/nv_type.h b/drivers/video/nvidia/nv_type.h
index 38f7cc0a23312a9701f0626a0f2f0457c9841279..f132aab8c5de2fbd57acd1ea1c5c3c934d85dd6c 100644 (file)
--- a/drivers/video/nvidia/nv_type.h
+++ b/drivers/video/nvidia/nv_type.h
@@ -86,6 +86,7 @@ typedef struct _riva_hw_state {
        u32 timingV;
        u32 displayV;
        u32 crtcSync;
+       u32 control;
 } RIVA_HW_STATE;
 
 struct riva_regs {
@@ -134,6 +135,7 @@ struct nvidia_par {
        int paneltweak;
        int LVDS;
        int pm_state;
+       int reverse_i2c;
        u32 crtcSync_read;
        u32 fpSyncs;
        u32 dmaPut;