git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB: media/IR: Add missing include file to rc-map.c
[safe/jmp/linux-2.6]
/
drivers
/
media
/
IR
/
rc-map.c
diff --git
a/drivers/media/IR/rc-map.c
b/drivers/media/IR/rc-map.c
index
ff185c0
..
46a8f15
100644
(file)
--- a/
drivers/media/IR/rc-map.c
+++ b/
drivers/media/IR/rc-map.c
@@
-14,6
+14,7
@@
#include <media/ir-core.h>
#include <linux/spinlock.h>
#include <media/ir-core.h>
#include <linux/spinlock.h>
+#include <linux/delay.h>
/* Used to handle IR raw handler extensions */
static LIST_HEAD(rc_map_list);
/* Used to handle IR raw handler extensions */
static LIST_HEAD(rc_map_list);
@@
-37,14
+38,13
@@
static struct rc_keymap *seek_rc_map(const char *name)
struct ir_scancode_table *get_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) {
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;
if (rc < 0) {
printk(KERN_ERR "Couldn't load IR keymap %s\n", name);
return NULL;
@@
-82,8
+82,3
@@
void ir_unregister_map(struct rc_keymap *map)
}
EXPORT_SYMBOL_GPL(ir_unregister_map);
}
EXPORT_SYMBOL_GPL(ir_unregister_map);
-void rc_map_init(void)
-{
- spin_lock_init(&rc_map_lock);
-
-}