diff options
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/IR/ir-raw-event.c | 5 | ||||
| -rw-r--r-- | drivers/media/IR/rc-map.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c index 6a4445e5db1..b49d01256be 100644 --- a/drivers/media/IR/ir-raw-event.c +++ b/drivers/media/IR/ir-raw-event.c @@ -50,9 +50,10 @@ static DEFINE_SPINLOCK(ir_raw_handler_lock); _sumrc; \ }) - +#ifdef MODULE /* Used to load the decoders */ static struct work_struct wq_load; +#endif static void ir_raw_event_work(struct work_struct *work) { @@ -218,6 +219,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler) } EXPORT_SYMBOL(ir_raw_handler_unregister); +#ifdef MODULE static void init_decoders(struct work_struct *work) { /* Load the decoder modules */ @@ -229,6 +231,7 @@ static void init_decoders(struct work_struct *work) it is needed to change the CONFIG_MODULE test at ir-core.h */ } +#endif void ir_raw_init(void) { diff --git a/drivers/media/IR/rc-map.c b/drivers/media/IR/rc-map.c index ff185c05426..1a3f4b123a3 100644 --- a/drivers/media/IR/rc-map.c +++ b/drivers/media/IR/rc-map.c @@ -37,14 +37,13 @@ static struct rc_keymap *seek_rc_map(const char *name) struct ir_scancode_table *get_rc_map(const char *name) { - int rc = 0; struct rc_keymap *map; map = seek_rc_map(name); #ifdef MODULE if (!map) { - rc = request_module(name); + int rc = request_module(name); if (rc < 0) { printk(KERN_ERR "Couldn't load IR keymap %s\n", name); return NULL; |