diff --git a/[refs] b/[refs]
index 661fe458caec..0fc82b48e1ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13828c61e9d3fd293c284fd24077f1f7d0946458
+refs/heads/master: 54d80904b4c1f7aa1d569d07ca3e62fba0daf3a2
diff --git a/trunk/drivers/media/usb/hdpvr/hdpvr-video.c b/trunk/drivers/media/usb/hdpvr/hdpvr-video.c
index da6b77912222..6a15405360dc 100644
--- a/trunk/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/trunk/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/kconfig.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -1238,7 +1239,7 @@ static void hdpvr_device_release(struct video_device *vdev)
 	v4l2_device_unregister(&dev->v4l2_dev);
 
 	/* deregister I2C adapter */
-#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 	mutex_lock(&dev->i2c_mutex);
 	i2c_del_adapter(&dev->i2c_adapter);
 	mutex_unlock(&dev->i2c_mutex);