From 1d83350c851b49e603fa0dbc795ee1a29158c20a Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@mns.spb.ru>
Date: Mon, 22 Oct 2012 09:54:43 -0300
Subject: [PATCH] --- yaml --- r: 343875 b: refs/heads/master c:
 2669f1073958584295f71010e2d8a141da14a392 h: refs/heads/master i:   343873:
 37de6804e40af59c68c2a3c7e3f91cfa2f0fc9a3   343871:
 49a07aaefadf59e09a81ee43ce8c36668a30d710 v: v3

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

diff --git a/[refs] b/[refs]
index bbbd084ca626..2d36c4a97d73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7d993550167ef810b6658fc7b0a73517c2ed957
+refs/heads/master: 2669f1073958584295f71010e2d8a141da14a392
diff --git a/trunk/drivers/media/platform/vivi.c b/trunk/drivers/media/platform/vivi.c
index b366b050a3dd..3e6902a1bd22 100644
--- a/trunk/drivers/media/platform/vivi.c
+++ b/trunk/drivers/media/platform/vivi.c
@@ -39,7 +39,6 @@
 /* Wake up at about 30 fps */
 #define WAKE_NUMERATOR 30
 #define WAKE_DENOMINATOR 1001
-#define BUFFER_TIMEOUT     msecs_to_jiffies(500)  /* 0.5 seconds */
 
 #define MAX_WIDTH 1920
 #define MAX_HEIGHT 1200