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>