summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 09:36:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 09:36:50 -0700
commit5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch)
tree734289dc85074903d9e636a935d43414746e222c /drivers/video
parent5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff)
parent071361d3473ebb8142907470ff12d59c59f6be72 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual stuff, mostly comment fixes, typo fixes, printk fixes and small code cleanups" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits) mm: Convert print_symbol to %pSR gfs2: Convert print_symbol to %pSR m32r: Convert print_symbol to %pSR iostats.txt: add easy-to-find description for field 6 x86 cmpxchg.h: fix wrong comment treewide: Fix typo in printk and comments doc: devicetree: Fix various typos docbook: fix 8250 naming in device-drivers pata_pdc2027x: Fix compiler warning treewide: Fix typo in printks mei: Fix comments in drivers/misc/mei treewide: Fix typos in kernel messages pm44xx: Fix comment for "CONFIG_CPU_IDLE" doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP" mmzone: correct "pags" to "pages" in comment. kernel-parameters: remove outdated 'noresidual' parameter Remove spurious _H suffixes from ifdef comments sound: Remove stray pluses from Kconfig file radio-shark: Fix printk "CONFIG_LED_CLASS" doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE ...
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/amifb.c2
-rw-r--r--drivers/video/auo_k190x.c2
-rw-r--r--drivers/video/exynos/exynos_dp_core.c4
-rw-r--r--drivers/video/goldfishfb.c2
-rw-r--r--drivers/video/s1d13xxxfb.c2
-rw-r--r--drivers/video/ssd1307fb.c4
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 77cb4ffa1fe4..a6780eecff0e 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -1181,7 +1181,7 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
}
/*
- * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the folloing
+ * FB_VMODE_SMOOTH_XPAN will be cleared, if one of the following
* checks failed and smooth scrolling is not possible
*/
diff --git a/drivers/video/auo_k190x.c b/drivers/video/auo_k190x.c
index b1f19b266da7..8d2499d1cafb 100644
--- a/drivers/video/auo_k190x.c
+++ b/drivers/video/auo_k190x.c
@@ -1088,7 +1088,7 @@ int auok190x_common_probe(struct platform_device *pdev,
goto err_defio;
}
- dev_dbg(info->device, "targetting %d frames per second\n", board->fps);
+ dev_dbg(info->device, "targeting %d frames per second\n", board->fps);
info->fbdefio->delay = HZ / board->fps;
info->fbdefio->first_io = auok190xfb_dpy_first_io,
info->fbdefio->deferred_io = auok190xfb_dpy_deferred_io,
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index de9d4da0e3da..12bbede3b091 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -976,14 +976,14 @@ static int exynos_dp_dt_parse_phydata(struct exynos_dp_device *dp)
}
if (of_property_read_u32(dp_phy_node, "reg", &phy_base)) {
- dev_err(dp->dev, "faild to get reg for dptx-phy\n");
+ dev_err(dp->dev, "failed to get reg for dptx-phy\n");
ret = -EINVAL;
goto err;
}
if (of_property_read_u32(dp_phy_node, "samsung,enable-mask",
&dp->enable_mask)) {
- dev_err(dp->dev, "faild to get enable-mask for dptx-phy\n");
+ dev_err(dp->dev, "failed to get enable-mask for dptx-phy\n");
ret = -EINVAL;
goto err;
}
diff --git a/drivers/video/goldfishfb.c b/drivers/video/goldfishfb.c
index 489abb32fc04..7f6c9e6cfc6c 100644
--- a/drivers/video/goldfishfb.c
+++ b/drivers/video/goldfishfb.c
@@ -148,7 +148,7 @@ static int goldfish_fb_pan_display(struct fb_var_screeninfo *var,
wait_event_timeout(fb->wait,
fb->base_update_count != base_update_count, HZ / 15);
if (fb->base_update_count == base_update_count)
- pr_err("goldfish_fb_pan_display: timeout wating for base update\n");
+ pr_err("goldfish_fb_pan_display: timeout waiting for base update\n");
return 0;
}
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index 76d9053d88c1..05c2dc3d4bc0 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -862,7 +862,7 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
printk(KERN_INFO PFX
"unknown chip production id %i, revision %i\n",
prod_id, revision);
- printk(KERN_INFO PFX "please contant maintainer\n");
+ printk(KERN_INFO PFX "please contact maintainer\n");
goto bail;
}
diff --git a/drivers/video/ssd1307fb.c b/drivers/video/ssd1307fb.c
index 395cb6a8d8f3..9ef05d3ef68a 100644
--- a/drivers/video/ssd1307fb.c
+++ b/drivers/video/ssd1307fb.c
@@ -1,5 +1,5 @@
/*
- * Driver for the Solomon SSD1307 OLED controler
+ * Driver for the Solomon SSD1307 OLED controller
*
* Copyright 2012 Free Electrons
*
@@ -392,6 +392,6 @@ static struct i2c_driver ssd1307fb_driver = {
module_i2c_driver(ssd1307fb_driver);
-MODULE_DESCRIPTION("FB driver for the Solomon SSD1307 OLED controler");
+MODULE_DESCRIPTION("FB driver for the Solomon SSD1307 OLED controller");
MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>");
MODULE_LICENSE("GPL");