diff --git a/[refs] b/[refs]
index 34bdc96a8402..0473e95cf772 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6215596b5912c205ed48c11deb1cbdf0aa3ac25
+refs/heads/master: eed5670a31c511e196fd50fc591689ffdab61f80
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/af9035.c b/trunk/drivers/media/usb/dvb-usb-v2/af9035.c
index ea37b5c3c33f..19b139494448 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1146,6 +1146,7 @@ static int af9035_init(struct dvb_usb_device *d)
 	return ret;
 }
 
+#if defined(CONFIG_RC_CORE) || defined(CONFIG_RC_CORE_MODULE)
 static int af9035_rc_query(struct dvb_usb_device *d)
 {
 	unsigned int key;
@@ -1220,6 +1221,9 @@ static int af9035_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
 
 	return ret;
 }
+#else
+	#define af9035_get_rc_config NULL
+#endif
 
 /* interface 0 is used by DVB-T receiver and
    interface 1 is for remote controller (HID) */