diff options
author | Antti Palosaari <crope@iki.fi> | 2013-06-04 16:50:54 -0300 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:55:39 +0900 |
commit | 9576a6289cb23fceb5f747e30d09f8854a3ff3f0 (patch) | |
tree | b7a77de9e17ea7c51f61cba073000dc6866429e4 | |
parent | d10baf78f9f42c805265eb34abb39b4cde4e953f (diff) | |
download | linux-3.10-9576a6289cb23fceb5f747e30d09f8854a3ff3f0.tar.gz linux-3.10-9576a6289cb23fceb5f747e30d09f8854a3ff3f0.tar.bz2 linux-3.10-9576a6289cb23fceb5f747e30d09f8854a3ff3f0.zip |
upstream: [media] rtl28xxu: remove redundant IS_ENABLED macro
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c index 4234f54fedb..22f9379836a 100644 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c @@ -1263,11 +1263,7 @@ static int rtl2831u_get_rc_config(struct dvb_usb_device *d, return 0; } -#else - #define rtl2831u_get_rc_config NULL -#endif -#if IS_ENABLED(CONFIG_RC_CORE) static int rtl2832u_rc_query(struct dvb_usb_device *d) { int ret, i, len; @@ -1370,7 +1366,8 @@ static int rtl2832u_get_rc_config(struct dvb_usb_device *d, return 0; } #else - #define rtl2832u_get_rc_config NULL +#define rtl2831u_get_rc_config NULL +#define rtl2832u_get_rc_config NULL #endif static const struct dvb_usb_device_properties rtl2831u_props = { |