diff --git a/[refs] b/[refs]
index f923d0e0270b..13d985a707db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21354c6de395e2e3cf896cf72ac243d5773f7773
+refs/heads/master: ef3824029d0f5887c065ea461157bdf8b2287bf8
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
index 94f134c4e942..1330c644dd8d 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
@@ -204,15 +204,8 @@ static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
 	return 0;
 }
 #else
-static int dvb_usbv2_remote_init(struct dvb_usb_device *d)
-{
-	return 0;
-}
-
-static int dvb_usbv2_remote_exit(struct dvb_usb_device *d)
-{
-	return 0;
-}
+	#define dvb_usbv2_remote_init(args...) 0
+	#define dvb_usbv2_remote_exit(args...)
 #endif
 
 static void dvb_usb_data_complete(struct usb_data_stream *stream, u8 *buf,