From 9da750e2f0a15d9cbe17528f5bb99611660bc265 Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@mns.spb.ru>
Date: Fri, 2 Nov 2012 09:10:31 -0300
Subject: [PATCH] --- yaml --- r: 357091 b: refs/heads/master c:
 10ce84415836d3fbf907367b9eb595a0dfd6ccb1 h: refs/heads/master i:   357089:
 2d6e9d5fff52a2b6af79fea1e38d213be0277368   357087:
 a168358f513c3eef97b57e05a47aa08c0fb17280 v: v3

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

diff --git a/[refs] b/[refs]
index 608ca546546b..e125cbbc9deb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3a8b4d22b47b3ee17baccdc5b351465f890671c
+refs/heads/master: 10ce84415836d3fbf907367b9eb595a0dfd6ccb1
diff --git a/trunk/drivers/media/platform/vivi.c b/trunk/drivers/media/platform/vivi.c
index 3801a8d00946..a3090f0312c1 100644
--- a/trunk/drivers/media/platform/vivi.c
+++ b/trunk/drivers/media/platform/vivi.c
@@ -237,7 +237,7 @@ struct vivi_dev {
 	unsigned int		   field_count;
 
 	u8			   bars[9][3];
-	u8			   line[MAX_WIDTH * 8];
+	u8			   line[MAX_WIDTH * 8] __attribute__((__aligned__(4)));
 	unsigned int		   pixelsize;
 	u8			   alpha_component;
 	u32			   textfg, textbg;