diff --git a/[refs] b/[refs]
index 7b12c63a9a82..b7c25fe86d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b6c4857f7684f6d3f59e0506f62953575346978
+refs/heads/master: d713dfa708e14352cfb71342cf985d08fe14be95
diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c
index 67c8d274473b..b66112da2a61 100644
--- a/trunk/drivers/firewire/ohci.c
+++ b/trunk/drivers/firewire/ohci.c
@@ -1821,8 +1821,8 @@ static void bus_reset_work(struct work_struct *work)
 {
 	struct fw_ohci *ohci =
 		container_of(work, struct fw_ohci, bus_reset_work);
-	int self_id_count, i, j, reg;
-	int generation, new_generation;
+	int self_id_count, generation, new_generation, i, j;
+	u32 reg;
 	unsigned long flags;
 	void *free_rom = NULL;
 	dma_addr_t free_rom_bus = 0;