Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

14 files changed, 20 insertions, 20 deletions

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index d5e801076d33..3d886c6902f9 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -964,7 +964,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(1);
 
-        dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %lu\n",
+        dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n",
                        info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base);
 
         return 0;
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 913b4a47ae52..1ddeb4c34763 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3276,7 +3276,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                                 txtformat = "24 bit interface";
                                 break;
                         default:
-                                txtformat = "unkown format";
+                                txtformat = "unknown format";
                         }
                 } else {
                         switch (format & 7) {
@@ -3299,7 +3299,7 @@ static void __devinit aty_init_lcd(struct atyfb_par *par, u32 bios_base)
                                 txtformat = "262144 colours (FDPI-2 mode)";
                                 break;
                         default:
-                                txtformat = "unkown format";
+                                txtformat = "unknown format";
                         }
                 }
                 PRINTKI("%s%s %s monitor detected: %s\n",
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
index 505c0823a105..2cf7ba52f67c 100644
--- a/drivers/video/backlight/atmel-pwm-bl.c
+++ b/drivers/video/backlight/atmel-pwm-bl.c
@@ -158,7 +158,7 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev)
                         goto err_free_pwm;
                 }
 
-                /* Turn display off by defatult. */
+                /* Turn display off by default. */
                 retval = gpio_direction_output(pwmbl->gpio_on,
                                 0 ^ pdata->on_active_low);
                 if (retval)
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 50ec17dfc517..fa32b94a4546 100644
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -177,7 +177,7 @@ static int __devinit tosa_lcd_probe(struct spi_device *spi)
         if (!data)
                 return -ENOMEM;
 
-        data->is_vga = true; /* defaut to VGA mode */
+        data->is_vga = true; /* default to VGA mode */
 
         /*
          * bits_per_word cannot be configured in platform data
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 857b3668b3ba..6468a297e341 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -436,7 +436,7 @@ sti_init_glob_cfg(struct sti_struct *sti,
                             (offs < PCI_BASE_ADDRESS_0 ||
                              offs > PCI_BASE_ADDRESS_5)) {
                                 printk (KERN_WARNING
-                                        "STI pci region maping for region %d (%02x) can't be mapped\n",
+                                        "STI pci region mapping for region %d (%02x) can't be mapped\n",
                                         i,sti->rm_entry[i]);
                                 continue;
                         }
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index c27ab1ed9604..e59c08320886 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -71,7 +71,7 @@ int fb_deferred_io_fsync(struct file *file, struct dentry *dentry, int datasync)
 {
         struct fb_info *info = file->private_data;
 
-        /* Skip if deferred io is complied-in but disabled on this fbdev */
+        /* Skip if deferred io is compiled-in but disabled on this fbdev */
         if (!info->fbdefio)
                 return 0;
 
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c
index f67db4268374..695fa013fe7e 100644
--- a/drivers/video/gbefb.c
+++ b/drivers/video/gbefb.c
@@ -701,7 +701,7 @@ static int gbefb_set_par(struct fb_info *info)
            blocks of 512x128, 256x128 or 128x128 pixels, respectively for 8bit,
            16bit and 32 bit modes (64 kB). They cover the screen with partial
            tiles on the right and/or bottom of the screen if needed.
-           For exemple in 640x480 8 bit mode the mapping is:
+           For example in 640x480 8 bit mode the mapping is:
 
            <-------- 640 ----->
            <---- 512 ----><128|384 offscreen>
diff --git a/drivers/video/omap/lcd_ams_delta.c b/drivers/video/omap/lcd_ams_delta.c
index 1f7439955e02..319a9a2bc236 100644
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -123,12 +123,12 @@ struct platform_driver ams_delta_panel_driver = {
         },
 };
 
-static int ams_delta_panel_drv_init(void)
+static int __init ams_delta_panel_drv_init(void)
 {
         return platform_driver_register(&ams_delta_panel_driver);
 }
 
-static void ams_delta_panel_drv_cleanup(void)
+static void __exit ams_delta_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&ams_delta_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c
index 918ee8934196..d88a7928b341 100644
--- a/drivers/video/omap/lcd_mipid.c
+++ b/drivers/video/omap/lcd_mipid.c
@@ -607,7 +607,7 @@ static struct spi_driver mipid_spi_driver = {
         .remove = __devexit_p(mipid_spi_remove),
 };
 
-static int mipid_drv_init(void)
+static int __init mipid_drv_init(void)
 {
         spi_register_driver(&mipid_spi_driver);
 
@@ -615,7 +615,7 @@ static int mipid_drv_init(void)
 }
 module_init(mipid_drv_init);
 
-static void mipid_drv_cleanup(void)
+static void __exit mipid_drv_cleanup(void)
 {
         spi_unregister_driver(&mipid_spi_driver);
 }
diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index bba53714a7b1..f86012239bff 100644
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -260,13 +260,13 @@ static int sgivwfb_check_var(struct fb_var_screeninfo *var,
         var->grayscale = 0;     /* No grayscale for now */
 
         /* determine valid resolution and timing */
-        for (min_mode = 0; min_mode < DBE_VT_SIZE; min_mode++) {
+        for (min_mode = 0; min_mode < ARRAY_SIZE(dbeVTimings); min_mode++) {
                 if (dbeVTimings[min_mode].width >= var->xres &&
                     dbeVTimings[min_mode].height >= var->yres)
                         break;
         }
 
-        if (min_mode == DBE_VT_SIZE)
+        if (min_mode == ARRAY_SIZE(dbeVTimings))
                 return -EINVAL; /* Resolution to high */
 
         /* XXX FIXME - should try to pick best refresh rate */
diff --git a/drivers/video/stifb.c b/drivers/video/stifb.c
index 6120f0c526fe..876648e15e9d 100644
--- a/drivers/video/stifb.c
+++ b/drivers/video/stifb.c
@@ -756,9 +756,9 @@ hyperResetPlanes(struct stifb_info *fb, int enable)
                 if (fb->info.var.bits_per_pixel == 32)
                         controlPlaneReg = 0x04000F00;
                 else
-                        controlPlaneReg = 0x00000F00;   /* 0x00000800 should be enought, but lets clear all 4 bits */
+                        controlPlaneReg = 0x00000F00;   /* 0x00000800 should be enough, but lets clear all 4 bits */
         else
-                controlPlaneReg = 0x00000F00; /* 0x00000100 should be enought, but lets clear all 4 bits */
+                controlPlaneReg = 0x00000F00; /* 0x00000100 should be enough, but lets clear all 4 bits */
 
         switch (enable) {
         case ENABLE:
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index ff43c8885028..980548390048 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -52,7 +52,7 @@
  *
  * 0.1.3 (released 1999-11-02)  added Attila's panning support, code
  *                              reorg, hwcursor address page size alignment
- *                              (for mmaping both frame buffer and regs),
+ *                              (for mmapping both frame buffer and regs),
  *                              and my changes to get rid of hardcoded
  *                              VGA i/o register locations (uses PCI
  *                              configuration info now)
diff --git a/drivers/video/via/dvi.c b/drivers/video/via/dvi.c
index c5c32b6b6e6c..67b36932212b 100644
--- a/drivers/video/via/dvi.c
+++ b/drivers/video/via/dvi.c
@@ -467,7 +467,7 @@ static int dvi_get_panel_size_from_DDCv1(void)
         default:
                 viaparinfo->tmds_setting_info->dvi_panel_size =
                         VIA_RES_1024X768;
-                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d !\
+                DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d !\
                                          set default panel size.\n", max_h);
                 break;
         }
@@ -534,7 +534,7 @@ static int dvi_get_panel_size_from_DDCv2(void)
         default:
                 viaparinfo->tmds_setting_info->dvi_panel_size =
                         VIA_RES_1024X768;
-                DEBUG_MSG(KERN_INFO "Unknow panel size max resolution = %d!\
+                DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d!\
                                         set default panel size.\n", HSize);
                 break;
         }
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 3df17dc8c3d7..65ccd215d496 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -446,7 +446,7 @@ static int vt8623fb_set_par(struct fb_info *info)
 
         svga_wseq_mask(0x1E, 0xF0, 0xF0); // DI/DVP bus
         svga_wseq_mask(0x2A, 0x0F, 0x0F); // DI/DVP bus
-        svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read treshold
+        svga_wseq_mask(0x16, 0x08, 0xBF); // FIFO read threshold
         vga_wseq(NULL, 0x17, 0x1F);       // FIFO depth
         vga_wseq(NULL, 0x18, 0x4E);
         svga_wseq_mask(0x1A, 0x08, 0x08); // enable MMIO ?