aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/rc/ir-raw.c1
-rw-r--r--drivers/media/rc/rc-core-priv.h7
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/rc/ir-raw.c b/drivers/media/rc/ir-raw.c
index 5c42750c7b71..79a9cb653604 100644
--- a/drivers/media/rc/ir-raw.c
+++ b/drivers/media/rc/ir-raw.c
@@ -352,6 +352,7 @@ void ir_raw_init(void)
352 load_jvc_decode(); 352 load_jvc_decode();
353 load_sony_decode(); 353 load_sony_decode();
354 load_sanyo_decode(); 354 load_sanyo_decode();
355 load_sharp_decode();
355 load_mce_kbd_decode(); 356 load_mce_kbd_decode();
356 load_lirc_codec(); 357 load_lirc_codec();
357 358
diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
index c40d6660acac..dc3b0b798035 100644
--- a/drivers/media/rc/rc-core-priv.h
+++ b/drivers/media/rc/rc-core-priv.h
@@ -210,6 +210,13 @@ static inline void load_sony_decode(void) { }
210static inline void load_sanyo_decode(void) { } 210static inline void load_sanyo_decode(void) { }
211#endif 211#endif
212 212
213/* from ir-sharp-decoder.c */
214#ifdef CONFIG_IR_SHARP_DECODER_MODULE
215#define load_sharp_decode() request_module_nowait("ir-sharp-decoder")
216#else
217static inline void load_sharp_decode(void) { }
218#endif
219
213/* from ir-mce_kbd-decoder.c */ 220/* from ir-mce_kbd-decoder.c */
214#ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE 221#ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE
215#define load_mce_kbd_decode() request_module_nowait("ir-mce_kbd-decoder") 222#define load_mce_kbd_decode() request_module_nowait("ir-mce_kbd-decoder")