diff options
-rw-r--r-- | drivers/video/fbdev/fsl-diu-fb.c | 4 | ||||
-rw-r--r-- | include/linux/fsl-diu-fb.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c index c48a59e35fae..ca3d6b366471 100644 --- a/drivers/video/fbdev/fsl-diu-fb.c +++ b/drivers/video/fbdev/fsl-diu-fb.c | |||
@@ -439,12 +439,12 @@ static struct mfb_info mfb_template[] = { | |||
439 | static void __attribute__ ((unused)) fsl_diu_dump(struct diu __iomem *hw) | 439 | static void __attribute__ ((unused)) fsl_diu_dump(struct diu __iomem *hw) |
440 | { | 440 | { |
441 | mb(); | 441 | mb(); |
442 | pr_debug("DIU: desc=%08x,%08x,%08x, gamma=%08x pallete=%08x " | 442 | pr_debug("DIU: desc=%08x,%08x,%08x, gamma=%08x palette=%08x " |
443 | "cursor=%08x curs_pos=%08x diu_mode=%08x bgnd=%08x " | 443 | "cursor=%08x curs_pos=%08x diu_mode=%08x bgnd=%08x " |
444 | "disp_size=%08x hsyn_para=%08x vsyn_para=%08x syn_pol=%08x " | 444 | "disp_size=%08x hsyn_para=%08x vsyn_para=%08x syn_pol=%08x " |
445 | "thresholds=%08x int_mask=%08x plut=%08x\n", | 445 | "thresholds=%08x int_mask=%08x plut=%08x\n", |
446 | hw->desc[0], hw->desc[1], hw->desc[2], hw->gamma, | 446 | hw->desc[0], hw->desc[1], hw->desc[2], hw->gamma, |
447 | hw->pallete, hw->cursor, hw->curs_pos, hw->diu_mode, | 447 | hw->palette, hw->cursor, hw->curs_pos, hw->diu_mode, |
448 | hw->bgnd, hw->disp_size, hw->hsyn_para, hw->vsyn_para, | 448 | hw->bgnd, hw->disp_size, hw->hsyn_para, hw->vsyn_para, |
449 | hw->syn_pol, hw->thresholds, hw->int_mask, hw->plut); | 449 | hw->syn_pol, hw->thresholds, hw->int_mask, hw->plut); |
450 | rmb(); | 450 | rmb(); |
diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h index a1e8277120c7..c46eab5bc893 100644 --- a/include/linux/fsl-diu-fb.h +++ b/include/linux/fsl-diu-fb.h | |||
@@ -73,7 +73,7 @@ struct diu_ad { | |||
73 | /* Word 0(32-bit) in DDR memory */ | 73 | /* Word 0(32-bit) in DDR memory */ |
74 | /* __u16 comp; */ | 74 | /* __u16 comp; */ |
75 | /* __u16 pixel_s:2; */ | 75 | /* __u16 pixel_s:2; */ |
76 | /* __u16 pallete:1; */ | 76 | /* __u16 palette:1; */ |
77 | /* __u16 red_c:2; */ | 77 | /* __u16 red_c:2; */ |
78 | /* __u16 green_c:2; */ | 78 | /* __u16 green_c:2; */ |
79 | /* __u16 blue_c:2; */ | 79 | /* __u16 blue_c:2; */ |
@@ -142,7 +142,7 @@ struct diu_ad { | |||
142 | struct diu { | 142 | struct diu { |
143 | __be32 desc[3]; | 143 | __be32 desc[3]; |
144 | __be32 gamma; | 144 | __be32 gamma; |
145 | __be32 pallete; | 145 | __be32 palette; |
146 | __be32 cursor; | 146 | __be32 cursor; |
147 | __be32 curs_pos; | 147 | __be32 curs_pos; |
148 | __be32 diu_mode; | 148 | __be32 diu_mode; |