From fbd932410adc04a58d28799919d3fdd56492d6e7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 17 Oct 2013 23:13:55 +0200
Subject: tv: simplify ifdeffery

Too ugly to leave it be.
---
 stream/tv.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'stream')

diff --git a/stream/tv.c b/stream/tv.c
index 3b1a8a2cfc..43a516e202 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -473,16 +473,10 @@ static int open_tv(tvi_handle_t *tvh)
     /* set some params got from cmdline */
     funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tvh->tv_param->input);
 
-#if defined(CONFIG_TV_V4L2)
-    if (0
-#ifdef CONFIG_TV_V4L2
-    || (!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0)
-#endif
-    )
+    if ((!strcmp(tvh->tv_param->driver, "v4l2") && tvh->tv_param->normid >= 0))
 	tv_set_norm_i(tvh, tvh->tv_param->normid);
     else
-#endif
-    tv_set_norm(tvh,tvh->tv_param->norm);
+        tv_set_norm(tvh,tvh->tv_param->norm);
 
     /* limits on w&h are norm-dependent -- JM */
     if (tvh->tv_param->width != -1 && tvh->tv_param->height != -1) {
-- 
cgit v1.2.3