diff options
author | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-14 15:33:34 +0530 |
---|---|---|
committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-14 15:33:34 +0530 |
commit | 638bc555a05c39ced59744c79c0461536782808d (patch) | |
tree | 42bf9c8cdfd44898be31bc31cf2e4743a2484cf4 /drivers/video | |
parent | f05a661e2247076a0c0e5a09ee8c4397b0de855e (diff) | |
parent | caf4b0430be8296bf644199bf3ed3056c02420c7 (diff) |
Merge branch 'linux-3.1.5' into android-tegra-nv-3.1
Conflicts:
arch/arm/Kconfig
Change-Id: If8aaaf3efcbbf6c9017b38efb6d76ef933f147fa
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/via/share.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h index 61b0bd596b85..1603023e3aa5 100644 --- a/drivers/video/via/share.h +++ b/drivers/video/via/share.h @@ -557,8 +557,8 @@ #define M1200X720_R60_VSP POSITIVE /* 1200x900@60 Sync Polarity (DCON) */ -#define M1200X900_R60_HSP NEGATIVE -#define M1200X900_R60_VSP NEGATIVE +#define M1200X900_R60_HSP POSITIVE +#define M1200X900_R60_VSP POSITIVE /* 1280x600@60 Sync Polarity (GTF Mode) */ #define M1280x600_R60_HSP NEGATIVE |