diff --git a/[refs] b/[refs]
index f70fdb419008..92ef42be6316 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdd3f29eddd1b7c26b3b42e3633afcb22a28fcb3
+refs/heads/master: 7fced565e55be83a18a3b7bb64995515c61edd53
diff --git a/trunk/drivers/net/can/softing/softing_cs.c b/trunk/drivers/net/can/softing/softing_cs.c
index c2c0a5bb0b21..77620543cd91 100644
--- a/trunk/drivers/net/can/softing/softing_cs.c
+++ b/trunk/drivers/net/can/softing/softing_cs.c
@@ -27,7 +27,7 @@
 #include "softing_platform.h"
 
 static int softingcs_index;
-static spinlock_t softingcs_index_lock;
+static DEFINE_SPINLOCK(softingcs_index_lock);
 
 static int softingcs_reset(struct platform_device *pdev, int v);
 static int softingcs_enable_irq(struct platform_device *pdev, int v);
@@ -342,7 +342,6 @@ static struct pcmcia_driver softingcs_driver = {
 
 static int __init softingcs_start(void)
 {
-	spin_lock_init(&softingcs_index_lock);
 	return pcmcia_register_driver(&softingcs_driver);
 }