X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fmedia%2FIR%2Frc-map.c;h=46a8f1524b5ba7e64e64aeb4bd72d978beb64ac7;hb=a7b39036cfd1d3f868a6745e40bc99b2a8650bad;hp=ff185c054267caef50996594dfffe3f054926122;hpb=6eb9435b874ae5ff56d56952167a8e9be5c5deeb;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/media/IR/rc-map.c b/drivers/media/IR/rc-map.c
index ff185c0..46a8f15 100644
--- 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 <linux/delay.h>
 
 /* 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)
 {
-	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;
@@ -82,8 +82,3 @@ void ir_unregister_map(struct rc_keymap *map)
 }
 EXPORT_SYMBOL_GPL(ir_unregister_map);
 
-void rc_map_init(void)
-{
-	spin_lock_init(&rc_map_lock);
-
-}