diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-05-25 14:41:49 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-05-25 14:41:49 +0530 |
| commit | 0ddd2fe3f85f8581e9fed54bd5fdfe6341fdab50 (patch) | |
| tree | c3f13b912a6a13e239e012f02b815b1d8392f626 /arch/arm/mach-tegra/include | |
| parent | 7746a73b787ca8956d0df66c1b8e11c0343d54fe (diff) | |
| parent | e70a45d0e17f752d11d1d6bc8df29fdf12b80196 (diff) | |
Merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/include/mach/dc.h
drivers/video/tegra/dc/dc.c
Change-Id: I88eb56972632ec9c87c6ac81c14c0cadb689415c
Diffstat (limited to 'arch/arm/mach-tegra/include')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/dc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h index 8772d732068a..70d74d469dc5 100644 --- a/arch/arm/mach-tegra/include/mach/dc.h +++ b/arch/arm/mach-tegra/include/mach/dc.h @@ -347,6 +347,8 @@ struct tegra_dc_win { #define TEGRA_WIN_FLAG_BLEND_PREMULT (1 << 1) #define TEGRA_WIN_FLAG_BLEND_COVERAGE (1 << 2) #define TEGRA_WIN_FLAG_TILED (1 << 3) +#define TEGRA_WIN_FLAG_INVERT_H (1 << 4) +#define TEGRA_WIN_FLAG_INVERT_V (1 << 5) #define TEGRA_WIN_BLEND_FLAGS_MASK \ (TEGRA_WIN_FLAG_BLEND_PREMULT | TEGRA_WIN_FLAG_BLEND_COVERAGE) |