From f8c4dccafc55aa68d65acf63c1ff97525cd9ec33 Mon Sep 17 00:00:00 2001 From: "Justin P. Mattock" Date: Mon, 2 Apr 2012 07:25:19 -0700 Subject: [PATCH] --- yaml --- r: 304298 b: refs/heads/master c: 6354eb81fe8cc32899959d2dac23aa1c9a12c9fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_fb.c | 2 +- trunk/drivers/staging/omapdrm/tcm-sita.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 510f5191d624..ec601c1fde81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73e2918990c0d0ba7866696d492a8090e4f9f396 +refs/heads/master: 6354eb81fe8cc32899959d2dac23aa1c9a12c9fa diff --git a/trunk/drivers/staging/omapdrm/omap_fb.c b/trunk/drivers/staging/omapdrm/omap_fb.c index 04b235b6724a..0c53a3c313ff 100644 --- a/trunk/drivers/staging/omapdrm/omap_fb.c +++ b/trunk/drivers/staging/omapdrm/omap_fb.c @@ -167,7 +167,7 @@ void omap_framebuffer_update_scanout(struct drm_framebuffer *fb, int x, int y, } /* Call for unpin 'a' (if not NULL), and pin 'b' (if not NULL). Although - * buffers to unpin are just just pushed to the unpin fifo so that the + * buffers to unpin are just pushed to the unpin fifo so that the * caller can defer unpin until vblank. * * Note if this fails (ie. something went very wrong!), all buffers are diff --git a/trunk/drivers/staging/omapdrm/tcm-sita.c b/trunk/drivers/staging/omapdrm/tcm-sita.c index 10d5ac3dae4b..efb609510540 100644 --- a/trunk/drivers/staging/omapdrm/tcm-sita.c +++ b/trunk/drivers/staging/omapdrm/tcm-sita.c @@ -200,7 +200,7 @@ static s32 sita_reserve_1d(struct tcm *tcm, u32 num_slots, * * @param w width * @param h height - * @param area pointer to the area that will be populated with the reesrved + * @param area pointer to the area that will be populated with the reserved * area * * @return 0 on success, non-0 error value on failure.