Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 251114
b: refs/heads/master
c: 6aa9681
h: refs/heads/master
v: v3
  • Loading branch information
Jingoo Han authored and Paul Mundt committed May 24, 2011
1 parent 397279a commit fd20c44
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 8f25c01dec43ccfb0ec7d6216c1494772917a429
refs/heads/master: 6aa9681100303bd467cbd0262eb00da8d492fc7f
6 changes: 4 additions & 2 deletions trunk/drivers/video/s3c-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1526,7 +1526,8 @@ static int s3c_fb_resume(struct device *dev)

clk_enable(sfb->bus_clk);

/* setup registers */
/* setup gpio and output polarity controls */
pd->setup_gpio();
writel(pd->vidcon1, sfb->regs + VIDCON1);

/* zero all windows before we do anything */
Expand Down Expand Up @@ -1584,7 +1585,8 @@ static int s3c_fb_runtime_resume(struct device *dev)

clk_enable(sfb->bus_clk);

/* setup registers */
/* setup gpio and output polarity controls */
pd->setup_gpio();
writel(pd->vidcon1, sfb->regs + VIDCON1);

/* zero all windows before we do anything */
Expand Down

0 comments on commit fd20c44

Please sign in to comment.