diff --git a/[refs] b/[refs]
index c14dca283c69..b0b11ac21bb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a40bf5591681f707afcf550cdcb4cc1697a29504
+refs/heads/master: 291f006efeebeeb2073289e44efb8f97cf157220
diff --git a/trunk/drivers/media/dvb/firesat/firesat_1394.c b/trunk/drivers/media/dvb/firesat/firesat_1394.c
index 82bd9786571d..11db62730256 100644
--- a/trunk/drivers/media/dvb/firesat/firesat_1394.c
+++ b/trunk/drivers/media/dvb/firesat/firesat_1394.c
@@ -94,7 +94,7 @@ MODULE_DEVICE_TABLE(ieee1394, firesat_id_table);
 
 /* list of all firesat devices */
 LIST_HEAD(firesat_list);
-spinlock_t firesat_list_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(firesat_list_lock);
 
 static void fcp_request(struct hpsb_host *host,
 			int nodeid,