From a2907de679439608d22c5bf3cbd62740e94181fc Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Sat, 19 Jan 2013 19:41:09 -0300
Subject: [PATCH] --- yaml --- r: 357497 b: refs/heads/master c:
 8c31522c64968ae790b0d767d27655c24d913837 h: refs/heads/master i:   357495:
 37e9202c2e79dda41341e2d5d48a0f8f3b33262e v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/pci/saa7134/saa7134.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 409573f8d43f..efdd0770a83e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8268979a429f6c3f6584d7d650af84444336d468
+refs/heads/master: 8c31522c64968ae790b0d767d27655c24d913837
diff --git a/trunk/drivers/media/pci/saa7134/saa7134.h b/trunk/drivers/media/pci/saa7134/saa7134.h
index 6eae4321229a..f804324e07fd 100644
--- a/trunk/drivers/media/pci/saa7134/saa7134.h
+++ b/trunk/drivers/media/pci/saa7134/saa7134.h
@@ -42,7 +42,7 @@
 #include <media/videobuf-dma-sg.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
-#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
 #include <media/videobuf-dvb.h>
 #endif
 
@@ -644,7 +644,7 @@ struct saa7134_dev {
 	struct work_struct         empress_workqueue;
 	int                        empress_started;
 
-#if defined(CONFIG_VIDEO_SAA7134_DVB) || defined(CONFIG_VIDEO_SAA7134_DVB_MODULE)
+#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
 	/* SAA7134_MPEG_DVB only */
 	struct videobuf_dvb_frontends frontends;
 	int (*original_demod_sleep)(struct dvb_frontend *fe);