summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc
diff options
context:
space:
mode:
authorAri Hirvonen <ahirvonen@nvidia.com>2010-12-30 15:18:18 +0200
committerErik Gilling <konkers@android.com>2011-01-04 17:50:07 -0800
commit1af1da3f6bb77f993dce12311101d2b3336ba92a (patch)
tree45d1982270cf24069f0862d2b96faf30179fd24f /drivers/video/tegra/dc
parent619ec9a64fc0d4e99109f12bd8f30cf0761f1d5d (diff)
video: tegra: fix typo from register header
Change-Id: Ifa7b454791f2d32cd1d12a8930890e061e835ef6 Signed-off-by: Michael I. Gold <gold@nvidia.com>
Diffstat (limited to 'drivers/video/tegra/dc')
-rw-r--r--drivers/video/tegra/dc/dc_reg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/dc_reg.h b/drivers/video/tegra/dc/dc_reg.h
index f643ec9ec742..bd1750b78e44 100644
--- a/drivers/video/tegra/dc/dc_reg.h
+++ b/drivers/video/tegra/dc/dc_reg.h
@@ -396,7 +396,7 @@
#define BLEND_WEIGHT1(x) (((x) & 0xff) << 16)
#define BLEND(key, control, weight0, weight1) \
(CKEY_ ## key | BLEND_CONTROL_ ## control | \
- BLEND_WEIGHT0(weight0) | BLEND_WEIGHT0(weight1))
+ BLEND_WEIGHT0(weight0) | BLEND_WEIGHT1(weight1))
#define DC_WIN_HP_FETCH_CONTROL 0x714