From ee424937ceeb07ea2a4fcd91521d4c7540cec275 Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Mon, 9 Apr 2012 21:39:53 +0200
Subject: [PATCH] --- yaml --- r: 307576 b: refs/heads/master c:
 d713dfa708e14352cfb71342cf985d08fe14be95 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/firewire/ohci.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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;