firewire: restore the device.h include in linux/firewire.h
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 1 Apr 2012 20:38:45 +0000 (16:38 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 Apr 2012 21:41:27 +0000 (14:41 -0700)
Commit 313162d0b838 ("device.h: audit and cleanup users in main include
dir") exchanged an include <linux/device.h> for a struct *device but in
actuality I misread this file when creating 313162d and it should have
remained an include.

There were no build regressions since all consumers were already getting
device.h anyway, but make it right regardless.

Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/firewire.h

index 4db7b68f058240ed0611fb0616d5c5ea91e79279..cdc9b719e9c7e285e85878677a64ff4b3d7d3501 100644 (file)
@@ -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;