diff options
-rw-r--r-- | drivers/video/arcfb.c | 4 | ||||
-rw-r--r-- | drivers/video/atmel_lcdfb.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/radeon_base.c | 2 | ||||
-rw-r--r-- | drivers/video/bfin_adv7393fb.c | 2 | ||||
-rw-r--r-- | drivers/video/cirrusfb.c | 2 | ||||
-rw-r--r-- | drivers/video/exynos/exynos_dp_reg.c | 2 | ||||
-rw-r--r-- | drivers/video/exynos/exynos_mipi_dsi.c | 2 | ||||
-rw-r--r-- | drivers/video/i740fb.c | 6 | ||||
-rw-r--r-- | drivers/video/s3c-fb.c | 2 | ||||
-rw-r--r-- | drivers/video/savage/savagefb_driver.c | 6 | ||||
-rw-r--r-- | drivers/video/smscufx.c | 4 | ||||
-rw-r--r-- | drivers/video/sunxvr500.c | 2 |
13 files changed, 19 insertions, 19 deletions
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index c22e8d39a2cb..a1d58e9d3073 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
@@ -336,8 +336,8 @@ static void arcfb_lcd_update_horiz(struct arcfb_par *par, unsigned int left, | |||
336 | } | 336 | } |
337 | 337 | ||
338 | /* | 338 | /* |
339 | * here we start the process of spliting out the fb update into | 339 | * here we start the process of splitting out the fb update into |
340 | * individual blocks of pixels. we end up spliting into 64x64 blocks | 340 | * individual blocks of pixels. we end up splitting into 64x64 blocks |
341 | * and finally down to 64x8 pages. | 341 | * and finally down to 64x8 pages. |
342 | */ | 342 | */ |
343 | static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx, | 343 | static void arcfb_lcd_update(struct arcfb_par *par, unsigned int dx, |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index d99505b16374..15055395cd95 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -939,7 +939,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) | |||
939 | * up a splash image. | 939 | * up a splash image. |
940 | */ | 940 | */ |
941 | } else { | 941 | } else { |
942 | /* alocate memory buffer */ | 942 | /* allocate memory buffer */ |
943 | ret = atmel_lcdfb_alloc_video_memory(sinfo); | 943 | ret = atmel_lcdfb_alloc_video_memory(sinfo); |
944 | if (ret < 0) { | 944 | if (ret < 0) { |
945 | dev_err(dev, "cannot allocate framebuffer: %d\n", ret); | 945 | dev_err(dev, "cannot allocate framebuffer: %d\n", ret); |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 622f12b62a47..3f2e8c13f1ca 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -863,7 +863,7 @@ static int aty_var_to_crtc(const struct fb_info *info, | |||
863 | 863 | ||
864 | if ((xres > 1600) || (yres > 1200)) { | 864 | if ((xres > 1600) || (yres > 1200)) { |
865 | FAIL("MACH64 chips are designed for max 1600x1200\n" | 865 | FAIL("MACH64 chips are designed for max 1600x1200\n" |
866 | "select anoter resolution."); | 866 | "select another resolution."); |
867 | } | 867 | } |
868 | h_sync_strt = h_disp + var->right_margin; | 868 | h_sync_strt = h_disp + var->right_margin; |
869 | h_sync_end = h_sync_strt + var->hsync_len; | 869 | h_sync_end = h_sync_strt + var->hsync_len; |
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index ce1506b75adf..9e279ee38da8 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c | |||
@@ -2018,7 +2018,7 @@ static void radeon_identify_vram(struct radeonfb_info *rinfo) | |||
2018 | if ((rinfo->family == CHIP_FAMILY_RS100) || | 2018 | if ((rinfo->family == CHIP_FAMILY_RS100) || |
2019 | (rinfo->family == CHIP_FAMILY_RS200)) { | 2019 | (rinfo->family == CHIP_FAMILY_RS200)) { |
2020 | /* This is to workaround the asic bug for RMX, some versions | 2020 | /* This is to workaround the asic bug for RMX, some versions |
2021 | of BIOS dosen't have this register initialized correctly. | 2021 | of BIOS doesn't have this register initialized correctly. |
2022 | */ | 2022 | */ |
2023 | OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN, | 2023 | OUTREGP(CRTC_MORE_CNTL, CRTC_H_CUTOFF_ACTIVE_EN, |
2024 | ~CRTC_H_CUTOFF_ACTIVE_EN); | 2024 | ~CRTC_H_CUTOFF_ACTIVE_EN); |
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c index 1a268a294478..633e9fe0d177 100644 --- a/drivers/video/bfin_adv7393fb.c +++ b/drivers/video/bfin_adv7393fb.c | |||
@@ -58,7 +58,7 @@ static const unsigned short ppi_pins[] = { | |||
58 | */ | 58 | */ |
59 | 59 | ||
60 | static struct bfin_adv7393_fb_par { | 60 | static struct bfin_adv7393_fb_par { |
61 | /* structure holding blackfin / adv7393 paramters when | 61 | /* structure holding blackfin / adv7393 parameters when |
62 | screen is blanked */ | 62 | screen is blanked */ |
63 | struct { | 63 | struct { |
64 | u8 Mode; /* ntsc/pal/? */ | 64 | u8 Mode; /* ntsc/pal/? */ |
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 738c8ce7d132..bc67d05cad60 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
@@ -1611,7 +1611,7 @@ static void init_vgachip(struct fb_info *info) | |||
1611 | /* ext. display controls: ext.adr. wrap */ | 1611 | /* ext. display controls: ext.adr. wrap */ |
1612 | vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02); | 1612 | vga_wcrt(cinfo->regbase, CL_CRT1B, 0x02); |
1613 | 1613 | ||
1614 | /* Set/Reset registes: - */ | 1614 | /* Set/Reset registers: - */ |
1615 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_VALUE, 0x00); | 1615 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_VALUE, 0x00); |
1616 | /* Set/Reset enable: - */ | 1616 | /* Set/Reset enable: - */ |
1617 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00); | 1617 | vga_wgfx(cinfo->regbase, VGA_GFX_SR_ENABLE, 0x00); |
diff --git a/drivers/video/exynos/exynos_dp_reg.c b/drivers/video/exynos/exynos_dp_reg.c index 6548afa0e3d2..7ddd67d4bd7a 100644 --- a/drivers/video/exynos/exynos_dp_reg.c +++ b/drivers/video/exynos/exynos_dp_reg.c | |||
@@ -717,7 +717,7 @@ int exynos_dp_read_bytes_from_i2c(struct exynos_dp_device *dp, | |||
717 | 717 | ||
718 | /* | 718 | /* |
719 | * If Rx sends defer, Tx sends only reads | 719 | * If Rx sends defer, Tx sends only reads |
720 | * request without sending addres | 720 | * request without sending address |
721 | */ | 721 | */ |
722 | if (!defer) | 722 | if (!defer) |
723 | retval = exynos_dp_select_i2c_device(dp, | 723 | retval = exynos_dp_select_i2c_device(dp, |
diff --git a/drivers/video/exynos/exynos_mipi_dsi.c b/drivers/video/exynos/exynos_mipi_dsi.c index 557091dc0e97..115e1b0a1970 100644 --- a/drivers/video/exynos/exynos_mipi_dsi.c +++ b/drivers/video/exynos/exynos_mipi_dsi.c | |||
@@ -104,7 +104,7 @@ static void exynos_mipi_update_cfg(struct mipi_dsim_device *dsim) | |||
104 | 104 | ||
105 | /* | 105 | /* |
106 | * data from Display controller(FIMD) is transferred in video mode | 106 | * data from Display controller(FIMD) is transferred in video mode |
107 | * but in case of command mode, all settigs is updated to registers. | 107 | * but in case of command mode, all settings are updated to registers. |
108 | */ | 108 | */ |
109 | exynos_mipi_dsi_stand_by(dsim, 1); | 109 | exynos_mipi_dsi_stand_by(dsim, 1); |
110 | } | 110 | } |
diff --git a/drivers/video/i740fb.c b/drivers/video/i740fb.c index fe574d84ed99..ff3f8808e4e9 100644 --- a/drivers/video/i740fb.c +++ b/drivers/video/i740fb.c | |||
@@ -497,7 +497,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var, | |||
497 | 497 | ||
498 | mem = vxres * vyres * ((bpp + 1) / 8); | 498 | mem = vxres * vyres * ((bpp + 1) / 8); |
499 | if (mem > info->screen_size) { | 499 | if (mem > info->screen_size) { |
500 | dev_err(info->device, "not enough video memory (%d KB requested, %ld KB avaliable)\n", | 500 | dev_err(info->device, "not enough video memory (%d KB requested, %ld KB available)\n", |
501 | mem >> 10, info->screen_size >> 10); | 501 | mem >> 10, info->screen_size >> 10); |
502 | return -ENOMEM; | 502 | return -ENOMEM; |
503 | } | 503 | } |
@@ -728,7 +728,7 @@ static void vga_protect(struct i740fb_par *par) | |||
728 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20); | 728 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0x20, 0x20); |
729 | 729 | ||
730 | i740inb(par, 0x3DA); | 730 | i740inb(par, 0x3DA); |
731 | i740outb(par, VGA_ATT_W, 0x00); /* enable pallete access */ | 731 | i740outb(par, VGA_ATT_W, 0x00); /* enable palette access */ |
732 | } | 732 | } |
733 | 733 | ||
734 | static void vga_unprotect(struct i740fb_par *par) | 734 | static void vga_unprotect(struct i740fb_par *par) |
@@ -737,7 +737,7 @@ static void vga_unprotect(struct i740fb_par *par) | |||
737 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20); | 737 | i740outreg_mask(par, VGA_SEQ_I, VGA_SEQ_CLOCK_MODE, 0, 0x20); |
738 | 738 | ||
739 | i740inb(par, 0x3DA); | 739 | i740inb(par, 0x3DA); |
740 | i740outb(par, VGA_ATT_W, 0x20); /* disable pallete access */ | 740 | i740outb(par, VGA_ATT_W, 0x20); /* disable palette access */ |
741 | } | 741 | } |
742 | 742 | ||
743 | static int i740fb_set_par(struct fb_info *info) | 743 | static int i740fb_set_par(struct fb_info *info) |
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index f3105160bf98..e5331fce0b44 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c | |||
@@ -189,7 +189,7 @@ struct s3c_fb_vsync { | |||
189 | 189 | ||
190 | /** | 190 | /** |
191 | * struct s3c_fb - overall hardware state of the hardware | 191 | * struct s3c_fb - overall hardware state of the hardware |
192 | * @slock: The spinlock protection for this data sturcture. | 192 | * @slock: The spinlock protection for this data sturucture. |
193 | * @dev: The device that we bound to, for printing, etc. | 193 | * @dev: The device that we bound to, for printing, etc. |
194 | * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. | 194 | * @bus_clk: The clk (hclk) feeding our interface and possibly pixclk. |
195 | * @lcd_clk: The clk (sclk) feeding pixclk. | 195 | * @lcd_clk: The clk (sclk) feeding pixclk. |
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index cee7803a0a1c..b4c2e2189322 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
@@ -662,7 +662,7 @@ static void savage_get_default_par(struct savagefb_par *par, struct savage_reg * | |||
662 | vga_out8(0x3c4, 0x18, par); | 662 | vga_out8(0x3c4, 0x18, par); |
663 | reg->SR18 = vga_in8(0x3c5, par); | 663 | reg->SR18 = vga_in8(0x3c5, par); |
664 | 664 | ||
665 | /* Save flat panel expansion regsters. */ | 665 | /* Save flat panel expansion registers. */ |
666 | if (par->chip == S3_SAVAGE_MX) { | 666 | if (par->chip == S3_SAVAGE_MX) { |
667 | int i; | 667 | int i; |
668 | 668 | ||
@@ -815,7 +815,7 @@ static void savage_set_default_par(struct savagefb_par *par, | |||
815 | vga_out8(0x3c4, 0x18, par); | 815 | vga_out8(0x3c4, 0x18, par); |
816 | vga_out8(0x3c5, reg->SR18, par); | 816 | vga_out8(0x3c5, reg->SR18, par); |
817 | 817 | ||
818 | /* Save flat panel expansion regsters. */ | 818 | /* Save flat panel expansion registers. */ |
819 | if (par->chip == S3_SAVAGE_MX) { | 819 | if (par->chip == S3_SAVAGE_MX) { |
820 | int i; | 820 | int i; |
821 | 821 | ||
@@ -1318,7 +1318,7 @@ static void savagefb_set_par_int(struct savagefb_par *par, struct savage_reg *r | |||
1318 | vga_out8(0x3c4, 0x15, par); | 1318 | vga_out8(0x3c4, 0x15, par); |
1319 | vga_out8(0x3c5, reg->SR15, par); | 1319 | vga_out8(0x3c5, reg->SR15, par); |
1320 | 1320 | ||
1321 | /* Restore flat panel expansion regsters. */ | 1321 | /* Restore flat panel expansion registers. */ |
1322 | if (par->chip == S3_SAVAGE_MX) { | 1322 | if (par->chip == S3_SAVAGE_MX) { |
1323 | int i; | 1323 | int i; |
1324 | 1324 | ||
diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c index 2e4c2492173a..538e5efe877a 100644 --- a/drivers/video/smscufx.c +++ b/drivers/video/smscufx.c | |||
@@ -1002,7 +1002,7 @@ static int ufx_ops_ioctl(struct fb_info *info, unsigned int cmd, | |||
1002 | /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ | 1002 | /* TODO: Help propose a standard fb.h ioctl to report mmap damage */ |
1003 | if (cmd == UFX_IOCTL_REPORT_DAMAGE) { | 1003 | if (cmd == UFX_IOCTL_REPORT_DAMAGE) { |
1004 | /* If we have a damage-aware client, turn fb_defio "off" | 1004 | /* If we have a damage-aware client, turn fb_defio "off" |
1005 | * To avoid perf imact of unecessary page fault handling. | 1005 | * To avoid perf imact of unnecessary page fault handling. |
1006 | * Done by resetting the delay for this fb_info to a very | 1006 | * Done by resetting the delay for this fb_info to a very |
1007 | * long period. Pages will become writable and stay that way. | 1007 | * long period. Pages will become writable and stay that way. |
1008 | * Reset to normal value when all clients have closed this fb. | 1008 | * Reset to normal value when all clients have closed this fb. |
@@ -1466,7 +1466,7 @@ static int ufx_read_edid(struct ufx_data *dev, u8 *edid, int edid_len) | |||
1466 | /* all FF's in the first 16 bytes indicates nothing is connected */ | 1466 | /* all FF's in the first 16 bytes indicates nothing is connected */ |
1467 | for (i = 0; i < 16; i++) { | 1467 | for (i = 0; i < 16; i++) { |
1468 | if (edid[i] != 0xFF) { | 1468 | if (edid[i] != 0xFF) { |
1469 | pr_debug("edid data read succesfully"); | 1469 | pr_debug("edid data read successfully"); |
1470 | return EDID_LENGTH; | 1470 | return EDID_LENGTH; |
1471 | } | 1471 | } |
1472 | } | 1472 | } |
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index b9c2b948d34d..eb931b8626fa 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c | |||
@@ -12,7 +12,7 @@ | |||
12 | 12 | ||
13 | #include <asm/io.h> | 13 | #include <asm/io.h> |
14 | 14 | ||
15 | /* XXX This device has a 'dev-comm' property which aparently is | 15 | /* XXX This device has a 'dev-comm' property which apparently is |
16 | * XXX a pointer into the openfirmware's address space which is | 16 | * XXX a pointer into the openfirmware's address space which is |
17 | * XXX a shared area the kernel driver can use to keep OBP | 17 | * XXX a shared area the kernel driver can use to keep OBP |
18 | * XXX informed about the current resolution setting. The idea | 18 | * XXX informed about the current resolution setting. The idea |