From a23b035ef08c31450e1e9f9a950a731327b542e1 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Sun, 1 Apr 2012 16:38:45 -0400
Subject: [PATCH] --- yaml --- r: 298430 b: refs/heads/master c:
 f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/firewire.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a89c0e388262..47514ac9f8e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a78da114c18c130769c1ba25cabbc34da7ad70c
+refs/heads/master: f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2
diff --git a/trunk/include/linux/firewire.h b/trunk/include/linux/firewire.h
index 4db7b68f0582..cdc9b719e9c7 100644
--- a/trunk/include/linux/firewire.h
+++ b/trunk/include/linux/firewire.h
@@ -2,6 +2,7 @@
 #define _LINUX_FIREWIRE_H
 
 #include <linux/completion.h>
+#include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/kref.h>
@@ -64,8 +65,6 @@
 #define CSR_MODEL		0x17
 #define CSR_DIRECTORY_ID	0x20
 
-struct device;
-
 struct fw_csr_iterator {
 	const u32 *p;
 	const u32 *end;