From fdf39a3e6b728fde747f4c8dd3a4356b9912f818 Mon Sep 17 00:00:00 2001 From: Kirill Smelkov Date: Tue, 23 Oct 2012 13:07:55 -0300 Subject: [PATCH] --- yaml --- r: 343901 b: refs/heads/master c: 2948b0b3ebbae98601c9b38e9841dbc754ca488c h: refs/heads/master i: 343899: f1baf286ee21aa937f0b8074c8e96a1489e5209d v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/vivi.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 190db89f22c7..08543f76ad64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ee28d94c9bfa0640a7c94c289ca0df239d90a0d +refs/heads/master: 2948b0b3ebbae98601c9b38e9841dbc754ca488c diff --git a/trunk/drivers/media/platform/vivi.c b/trunk/drivers/media/platform/vivi.c index 3e6902a1bd22..ef0fc276f7e7 100644 --- a/trunk/drivers/media/platform/vivi.c +++ b/trunk/drivers/media/platform/vivi.c @@ -351,11 +351,6 @@ static void precalculate_bars(struct vivi_dev *dev) } } -#define TSTAMP_MIN_Y 24 -#define TSTAMP_MAX_Y (TSTAMP_MIN_Y + 15) -#define TSTAMP_INPUT_X 10 -#define TSTAMP_MIN_X (54 + TSTAMP_INPUT_X) - /* 'odd' is true for pixels 1, 3, 5, etc. and false for pixels 0, 2, 4, etc. */ static void gen_twopix(struct vivi_dev *dev, u8 *buf, int colorpos, bool odd) {