diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-04-01 16:38:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-02 14:41:27 -0700 |
commit | f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2 (patch) | |
tree | d8f241632882ee7de71bc1aed211ac9f220d9352 /include | |
parent | 9a78da114c18c130769c1ba25cabbc34da7ad70c (diff) | |
download | linux-stable-f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2.tar.gz linux-stable-f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2.tar.bz2 linux-stable-f68c56b7d2351036d1ec58c7a0ac4f258cbc1fa2.zip |
firewire: restore the device.h include in linux/firewire.h
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/firewire.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 4db7b68f0582..cdc9b719e9c7 100644 --- a/include/linux/firewire.h +++ b/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; |