From 78d0ae86fae40371c332f42aaab3a939df3e8856 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Tue, 31 Mar 2009 15:25:17 -0700 Subject: [PATCH] --- yaml --- r: 139263 b: refs/heads/master c: 4242a23c9e6b8e2462bb49bf78b76bfdf32158b5 h: refs/heads/master i: 139261: a13525a1f3b7caa034d410581f3512b30b1799ff 139259: 17d1b4824fc8cd4955402dce30e9da204fecdcb1 139255: 2ab0de6b06af307de956ab683bdcc9ef44588e4e 139247: bb54a530a77091b27910caa9e95cc99a36e9e7dd 139231: 4c64e1056b8bd593944e39b6cc537a584c8cfef8 139199: d4b2b6f671a68a8e0e5d16f5c09a22dbc8d7b137 139135: 47b9a4852cf6f3efb9d4f84c6f098a963a7f6908 139007: 588d1b5e3b7f7665278e8b0808a5485b440d2878 138751: 9aeeda1ebda6164a313c35cdbac7c61bd4b08c6b 138239: d81b1198dfc83d73aa2885c4043bb341e4d4b586 137215: db91301455c129402251b6435a6e6c198d10c30b 135167: 2e3fa839e5d5bbce1870a1480804e1abcc3f411a 131071: 5e1d55329a1e76f29215b146a22e31dd45999a04 v: v3 --- [refs] | 2 +- trunk/drivers/video/cirrusfb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cac849077cd1..ae6ef91e3cf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df3aafd57d590d6f3d95310fc3430f3a536d1e59 +refs/heads/master: 4242a23c9e6b8e2462bb49bf78b76bfdf32158b5 diff --git a/trunk/drivers/video/cirrusfb.c b/trunk/drivers/video/cirrusfb.c index a364e1b0dcb7..9bb811d56721 100644 --- a/trunk/drivers/video/cirrusfb.c +++ b/trunk/drivers/video/cirrusfb.c @@ -875,7 +875,7 @@ static int cirrusfb_set_par_foo(struct fb_info *info) threshold = fb_readw(cinfo->laguna_mmio + 0xea); control &= ~0x6800; format = 0; - threshold &= 0xffe0 & 0x3fbf; + threshold &= 0xffc0 & 0x3fbf; } if (nom) { tmp = den << 1;