From b1d5d402b22c47977c6fb3808525b8a8684ac9c3 Mon Sep 17 00:00:00 2001
From: Peter Senna Tschudin <peter.senna@gmail.com>
Date: Sat, 19 Jan 2013 19:41:30 -0300
Subject: [PATCH] --- yaml --- r: 357501 b: refs/heads/master c:
 6a29b8080bd99793c86060d0dbebfd81c6aa4281 h: refs/heads/master i:   357499:
 2df08f3bdb729ec09690b76d8d9d6ce95cf45e0f v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 35c7dc31b14a..0aa56c3e97c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ecf9b085a0926e07c78c08a07296bbfd1c37d07
+refs/heads/master: 6a29b8080bd99793c86060d0dbebfd81c6aa4281
diff --git a/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c b/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c
index 6c5054f3f674..a38f58c4c6bf 100644
--- a/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c
+++ b/trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c
@@ -13,7 +13,7 @@
  *
  */
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 
 #include <linux/i2c.h>
 #include <linux/slab.h>