Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317535
b: refs/heads/master
c: 7756d3e
h: refs/heads/master
i:
  317533: 02782b8
  317531: 4c591b5
  317527: cfee3f2
  317519: eac6a9d
  317503: c428926
v: v3
  • Loading branch information
Justin P. Mattock authored and Greg Kroah-Hartman committed Jun 25, 2012
1 parent d8240c3 commit 65fbbcc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e2361720b9da9ec830d407da058ca1827e62b12
refs/heads/master: 7756d3e8b0acff580aab1f60c30e066e20a9900e
4 changes: 2 additions & 2 deletions trunk/drivers/staging/sm7xxfb/sm7xxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green,
case FB_VISUAL_DIRECTCOLOR:
case FB_VISUAL_TRUECOLOR:
/*
* 16/32 bit true-colour, use pseuo-palette for 16 base color
* 16/32 bit true-colour, use pseudo-palette for 16 base color
*/
if (regno < 16) {
if (sfb->fb.var.bits_per_pixel == 16) {
Expand Down Expand Up @@ -996,7 +996,7 @@ static int smtcfb_pci_suspend(struct device *device)

sfb = pci_get_drvdata(pdev);

/* set the hw in sleep mode use externel clock and self memory refresh
/* set the hw in sleep mode use external clock and self memory refresh
* so that we can turn off internal PLLs later on
*/
smtc_seqw(0x20, (smtc_seqr(0x20) | 0xc0));
Expand Down

0 comments on commit 65fbbcc

Please sign in to comment.