From: Peter Senna Tschudin <peter.senna@gmail.com>
To: mchehab@redhat.com
Cc: remi.schwartz@gmail.com, sean@mess.org,
kyle@kyle.strickland.name, simon.farnsworth@onelan.co.uk,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org,
Peter Senna Tschudin <peter.senna@gmail.com>
Subject: [PATCH 3/3] pci/saa7134: use IS_ENABLED() macro
Date: Wed, 09 Jan 2013 12:32:14 +0000 [thread overview]
Message-ID: <1357734734-2856-3-git-send-email-peter.senna@gmail.com> (raw)
In-Reply-To: <1357734734-2856-1-git-send-email-peter.senna@gmail.com>
replace:
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
with:
#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
This change was made for: CONFIG_VIDEO_SAA7134_DVB
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/media/pci/saa7134/saa7134.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 0a3feaa..ace44fd 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/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);
--
1.7.11.7
WARNING: multiple messages have this Message-ID (diff)
From: Peter Senna Tschudin <peter.senna@gmail.com>
To: mchehab@redhat.com
Cc: remi.schwartz@gmail.com, sean@mess.org,
kyle@kyle.strickland.name, simon.farnsworth@onelan.co.uk,
linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org,
Peter Senna Tschudin <peter.senna@gmail.com>
Subject: [PATCH 3/3] pci/saa7134: use IS_ENABLED() macro
Date: Wed, 9 Jan 2013 10:32:14 -0200 [thread overview]
Message-ID: <1357734734-2856-3-git-send-email-peter.senna@gmail.com> (raw)
In-Reply-To: <1357734734-2856-1-git-send-email-peter.senna@gmail.com>
replace:
#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
with:
#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
This change was made for: CONFIG_VIDEO_SAA7134_DVB
Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/media/pci/saa7134/saa7134.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 0a3feaa..ace44fd 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/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);
--
1.7.11.7
next prev parent reply other threads:[~2013-01-09 12:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-09 12:32 [PATCH 1/3] pci/cx88: use IS_ENABLED() macro Peter Senna Tschudin
2013-01-09 12:32 ` Peter Senna Tschudin
2013-01-09 12:32 ` [PATCH 2/3] pci/ttpci/av7110.c: " Peter Senna Tschudin
2013-01-09 12:32 ` Peter Senna Tschudin
2013-01-09 12:32 ` Peter Senna Tschudin [this message]
2013-01-09 12:32 ` [PATCH 3/3] pci/saa7134: " Peter Senna Tschudin
2013-01-09 12:49 ` [PATCH 1/3] pci/cx88: " Hans Verkuil
2013-01-09 12:49 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357734734-2856-3-git-send-email-peter.senna@gmail.com \
--to=peter.senna@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kyle@kyle.strickland.name \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=remi.schwartz@gmail.com \
--cc=sean@mess.org \
--cc=simon.farnsworth@onelan.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.