From e62966645a4eb9468ba57b551a7f0ae1cef9a1b7 Mon Sep 17 00:00:00 2001
From: Ian Armstrong <ian@iarmst.demon.co.uk>
Date: Mon, 6 Oct 2008 03:03:18 -0300
Subject: [PATCH] --- yaml --- r: 114086 b: refs/heads/master c:
 4ee0e42b31b282d0d0bb11effbbeb0610ee76d09 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/ivtv/ivtvfb.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 648a72630215..615ed10993aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c777549fc9c5c704707394b0235a9a6794247b83
+refs/heads/master: 4ee0e42b31b282d0d0bb11effbbeb0610ee76d09
diff --git a/trunk/drivers/media/video/ivtv/ivtvfb.c b/trunk/drivers/media/video/ivtv/ivtvfb.c
index 249758e53f5f..8a4a150b12fb 100644
--- a/trunk/drivers/media/video/ivtv/ivtvfb.c
+++ b/trunk/drivers/media/video/ivtv/ivtvfb.c
@@ -367,7 +367,7 @@ static int ivtvfb_prep_frame(struct ivtv *itv, int cmd, void __user *source,
 }
 
 static ssize_t ivtvfb_write(struct fb_info *info, const char __user *buf,
-		     size_t count, loff_t *ppos)
+						size_t count, loff_t *ppos)
 {
 	unsigned long p = *ppos;
 	void *dst;