diff --git a/[refs] b/[refs]
index b943bd587db2..fe94f9b9f755 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15100d891a53ffc717cec21d805f8c49db51fb65
+refs/heads/master: d46844300ccd99444d32e481751b6508c8c7834e
diff --git a/trunk/drivers/media/IR/ir-sysfs.c b/trunk/drivers/media/IR/ir-sysfs.c
index 4c0bc32dcbaf..18cab0f59fdd 100644
--- a/trunk/drivers/media/IR/ir-sysfs.c
+++ b/trunk/drivers/media/IR/ir-sysfs.c
@@ -295,8 +295,6 @@ static int __init ir_core_init(void)
 
 	/* Initialize/load the decoders/keymap code that will be used */
 	ir_raw_init();
-	rc_map_init();
-
 
 	return 0;
 }
diff --git a/trunk/drivers/media/IR/rc-map.c b/trunk/drivers/media/IR/rc-map.c
index 1a3f4b123a37..caf6a27b08c2 100644
--- a/trunk/drivers/media/IR/rc-map.c
+++ b/trunk/drivers/media/IR/rc-map.c
@@ -81,8 +81,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);
-
-}