diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
commit | 1aacb90eaaac057c10fd746e189553e04cfeb291 (patch) | |
tree | eaf5b2eddc9e2e446b5402c106a3bf086aee925a /drivers/gpu | |
parent | b05d59dfceaea72565b1648af929b037b0f96d7f (diff) | |
parent | 31789538e3ba7dd164e063d4978c96af1894be4c (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
Pull trivial tree changes from Jiri Kosina:
"Usual pile of patches from trivial tree that make the world go round"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
staging: go7007: remove reference to CONFIG_KMOD
aic7xxx: Remove obsolete preprocessor define
of: dma: doc fixes
doc: fix incorrect formula to calculate CommitLimit value
doc: Note need of bc in the kernel build from 3.10 onwards
mm: Fix printk typo in dmapool.c
modpost: Fix comment typo "Modules.symvers"
Kconfig.debug: Grammar s/addition/additional/
wimax: Spelling s/than/that/, wording s/destinatary/recipient/
aic7xxx: Spelling s/termnation/termination/
arm64: mm: Remove superfluous "the" in comment
of: Spelling s/anonymouns/anonymous/
dma: imx-sdma: Spelling s/determnine/determine/
ath10k: Improve grammar in comments
ath6kl: Spelling s/determnine/determine/
of: Improve grammar for of_alias_get_id() documentation
drm/exynos: Spelling s/contro/control/
radio-bcm2048.c: fix wrong overflow check
doc: printk-formats: do not mention casts for u64/s64
doc: spelling error changes
...
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index 09312b877470..3d78144387ac 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c | |||
@@ -284,7 +284,7 @@ static struct exynos_drm_ippdrv *ipp_find_drv_by_handle(u32 prop_id) | |||
284 | /* | 284 | /* |
285 | * This case is search ipp driver by prop_id handle. | 285 | * This case is search ipp driver by prop_id handle. |
286 | * sometimes, ipp subsystem find driver by prop_id. | 286 | * sometimes, ipp subsystem find driver by prop_id. |
287 | * e.g PAUSE state, queue buf, command contro. | 287 | * e.g PAUSE state, queue buf, command control. |
288 | */ | 288 | */ |
289 | list_for_each_entry(ippdrv, &exynos_drm_ippdrv_list, drv_list) { | 289 | list_for_each_entry(ippdrv, &exynos_drm_ippdrv_list, drv_list) { |
290 | DRM_DEBUG_KMS("count[%d]ippdrv[0x%x]\n", count++, (int)ippdrv); | 290 | DRM_DEBUG_KMS("count[%d]ippdrv[0x%x]\n", count++, (int)ippdrv); |