From bbb76a7dc5eb315412848ab410556f27d37e2f5b Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Sun, 9 Dec 2012 20:18:31 -0300 Subject: [PATCH] --- yaml --- r: 357333 b: refs/heads/master c: eed5670a31c511e196fd50fc591689ffdab61f80 h: refs/heads/master i: 357331: e53c2ab0c2f80b486febe23d51436fe7e84f37d4 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/dvb-usb-v2/af9035.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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) */