aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/aty/radeon_pm.c2
-rw-r--r--drivers/video/cyblafb.c2
-rw-r--r--drivers/video/intelfb/intelfb.h2
-rw-r--r--drivers/video/omap/lcdc.c2
-rw-r--r--drivers/video/sm501fb.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 83ee3e75386c..675abdafc2d8 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -2561,7 +2561,7 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
2561 pci_read_config_dword(rinfo->pdev, i * 4, 2561 pci_read_config_dword(rinfo->pdev, i * 4,
2562 &rinfo->cfg_save[i]); 2562 &rinfo->cfg_save[i]);
2563 2563
2564 /* Switch PCI power managment to D2. */ 2564 /* Switch PCI power management to D2. */
2565 pci_disable_device(rinfo->pdev); 2565 pci_disable_device(rinfo->pdev);
2566 for (;;) { 2566 for (;;) {
2567 pci_read_config_word( 2567 pci_read_config_word(
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
index e23324d10be2..9704b73135f5 100644
--- a/drivers/video/cyblafb.c
+++ b/drivers/video/cyblafb.c
@@ -1156,7 +1156,7 @@ static struct fb_ops cyblafb_ops __devinitdata = {
1156// need altered timings to display correctly. So I decided that it is much 1156// need altered timings to display correctly. So I decided that it is much
1157// better to provide a limited optimized set of modes plus the option of 1157// better to provide a limited optimized set of modes plus the option of
1158// using the mode in effect at startup time (might be selected using the 1158// using the mode in effect at startup time (might be selected using the
1159// vga=??? paramter). After that the user might use fbset to select any 1159// vga=??? parameter). After that the user might use fbset to select any
1160// mode he likes, check_var will not try to alter geometry parameters as 1160// mode he likes, check_var will not try to alter geometry parameters as
1161// it would be necessary otherwise. 1161// it would be necessary otherwise.
1162// 1162//
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index 2fe3f7def530..836796177942 100644
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -111,7 +111,7 @@
111 111
112#define FIXED_MODE(d) ((d)->fixed_mode) 112#define FIXED_MODE(d) ((d)->fixed_mode)
113 113
114/*** Driver paramters ***/ 114/*** Driver parameters ***/
115 115
116#define RINGBUFFER_SIZE KB(64) 116#define RINGBUFFER_SIZE KB(64)
117#define HW_CURSOR_SIZE KB(4) 117#define HW_CURSOR_SIZE KB(4)
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c
index 9085188d815e..fb19ed4992db 100644
--- a/drivers/video/omap/lcdc.c
+++ b/drivers/video/omap/lcdc.c
@@ -312,7 +312,7 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id)
312/* 312/*
313 * Change to a new video mode. We defer this to a later time to avoid any 313 * Change to a new video mode. We defer this to a later time to avoid any
314 * flicker and not to mess up the current LCD DMA context. For this we disable 314 * flicker and not to mess up the current LCD DMA context. For this we disable
315 * the LCD controler, which will generate a DONE irq after the last frame has 315 * the LCD controller, which will generate a DONE irq after the last frame has
316 * been transferred. Then it'll be safe to reconfigure both the LCD controller 316 * been transferred. Then it'll be safe to reconfigure both the LCD controller
317 * as well as the LCD DMA. 317 * as well as the LCD DMA.
318 */ 318 */
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 1be95a68d696..58f200c69be3 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -48,7 +48,7 @@ enum sm501_controller {
48 HEAD_PANEL = 1, 48 HEAD_PANEL = 1,
49}; 49};
50 50
51/* SM501 memory adress */ 51/* SM501 memory address */
52struct sm501_mem { 52struct sm501_mem {
53 unsigned long size; 53 unsigned long size;
54 unsigned long sm_addr; 54 unsigned long sm_addr;