summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx88/cx88-vp3054-i2c.h
diff options
context:
space:
mode:
authorPeter Senna Tschudin <peter.senna@gmail.com>2013-01-20 05:32:56 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-02-06 12:24:09 +0100
commit7b34be71db533f3e0cf93d53cf62d036cdb5418a (patch)
treee56ffc7b741157b73b1bebe23523eaaa4f482eb2 /drivers/media/pci/cx88/cx88-vp3054-i2c.h
parent[media] [V2,24/24] v4l2-core/v4l2-common.c: use IS_ENABLED() macro (diff)
downloadlinux-7b34be71db533f3e0cf93d53cf62d036cdb5418a.tar.xz
linux-7b34be71db533f3e0cf93d53cf62d036cdb5418a.zip
[media] use IS_ENABLED() macro
This patch introduces the use of IS_ENABLED() macro. For example, replacing: #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) with: #if IS_ENABLED(CONFIG_I2C) All changes made by this patch respect the same replacement pattern. Reported-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> Acked-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx88/cx88-vp3054-i2c.h')
-rw-r--r--drivers/media/pci/cx88/cx88-vp3054-i2c.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx88/cx88-vp3054-i2c.h b/drivers/media/pci/cx88/cx88-vp3054-i2c.h
index be99c931dc3e..95d0c60a35e1 100644
--- a/drivers/media/pci/cx88/cx88-vp3054-i2c.h
+++ b/drivers/media/pci/cx88/cx88-vp3054-i2c.h
@@ -30,7 +30,7 @@ struct vp3054_i2c_state {
};
/* ----------------------------------------------------------------------- */
-#if defined(CONFIG_VIDEO_CX88_VP3054) || (defined(CONFIG_VIDEO_CX88_VP3054_MODULE) && defined(MODULE))
+#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
int vp3054_i2c_probe(struct cx8802_dev *dev);
void vp3054_i2c_remove(struct cx8802_dev *dev);
#else