From af59cd9cd77576e5aff4c4b02bf7b201be64785d Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Sat, 19 Jan 2013 19:41:31 -0300 Subject: [PATCH] --- yaml --- r: 357502 b: refs/heads/master c: ffe4db06fdd294a3326e2f1009863825c0f6401c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/v4l2-core/v4l2-common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0aa56c3e97c6..5fc7da23e06b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a29b8080bd99793c86060d0dbebfd81c6aa4281 +refs/heads/master: ffe4db06fdd294a3326e2f1009863825c0f6401c diff --git a/trunk/drivers/media/v4l2-core/v4l2-common.c b/trunk/drivers/media/v4l2-core/v4l2-common.c index 614316f9b7a4..aa044f491666 100644 --- a/trunk/drivers/media/v4l2-core/v4l2-common.c +++ b/trunk/drivers/media/v4l2-core/v4l2-common.c @@ -238,7 +238,7 @@ int v4l2_chip_match_host(const struct v4l2_dbg_match *match) } EXPORT_SYMBOL(v4l2_chip_match_host); -#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) +#if IS_ENABLED(CONFIG_I2C) int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match) { int len; @@ -384,7 +384,7 @@ EXPORT_SYMBOL_GPL(v4l2_i2c_subdev_addr); const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type) { static const unsigned short radio_addrs[] = { -#if defined(CONFIG_MEDIA_TUNER_TEA5761) || defined(CONFIG_MEDIA_TUNER_TEA5761_MODULE) +#if IS_ENABLED(CONFIG_MEDIA_TUNER_TEA5761) 0x10, #endif 0x60,