Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208502
b: refs/heads/master
c: 8cfdcb2
h: refs/heads/master
v: v3
  • Loading branch information
Marek Szyprowski authored and Linus Torvalds committed Aug 11, 2010
1 parent 0dd7112 commit 111aa39
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: a8bdabca3ad69de632bd13f1cb65639e9a556e20
refs/heads/master: 8cfdcb2393b05cc80f89ed0110c0f90423d2fee1
10 changes: 5 additions & 5 deletions trunk/drivers/video/s3c-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ static int s3c_fb_resume(struct platform_device *pdev)
#define VALID_BPP124 (VALID_BPP(1) | VALID_BPP(2) | VALID_BPP(4))
#define VALID_BPP1248 (VALID_BPP124 | VALID_BPP(8))

static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] __devinitdata = {
static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] = {
[0] = {
.has_osd_c = 1,
.osd_size_off = 0x8,
Expand Down Expand Up @@ -1526,7 +1526,7 @@ static struct s3c_fb_win_variant s3c_fb_data_64xx_wins[] __devinitdata = {
},
};

static struct s3c_fb_driverdata s3c_fb_data_64xx __devinitdata = {
static struct s3c_fb_driverdata s3c_fb_data_64xx = {
.variant = {
.nr_windows = 5,
.vidtcon = VIDTCON0,
Expand Down Expand Up @@ -1556,7 +1556,7 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx __devinitdata = {
.win[4] = &s3c_fb_data_64xx_wins[4],
};

static struct s3c_fb_driverdata s3c_fb_data_s5pc100 __devinitdata = {
static struct s3c_fb_driverdata s3c_fb_data_s5pc100 = {
.variant = {
.nr_windows = 5,
.vidtcon = VIDTCON0,
Expand Down Expand Up @@ -1586,7 +1586,7 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pc100 __devinitdata = {
.win[4] = &s3c_fb_data_64xx_wins[4],
};

static struct s3c_fb_driverdata s3c_fb_data_s5pv210 __devinitdata = {
static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = {
.variant = {
.nr_windows = 5,
.vidtcon = VIDTCON0,
Expand Down Expand Up @@ -1617,7 +1617,7 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 __devinitdata = {
};

/* S3C2443/S3C2416 style hardware */
static struct s3c_fb_driverdata s3c_fb_data_s3c2443 __devinitdata = {
static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {
.variant = {
.nr_windows = 2,
.is_2443 = 1,
Expand Down

0 comments on commit 111aa39

Please sign in to comment.