Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / drivers / ieee1394 / iso.h

diff --git a/drivers/ieee1394/iso.h b/drivers/ieee1394/iso.h
index ed639c4c510fbe5890f8caea6ecaa309b5bb65d0..1210a97e8685624f7a5ccf669e892111d619d462 100644 (file)
--- a/drivers/ieee1394/iso.h
+++ b/drivers/ieee1394/iso.h
@@ -12,9 +12,14 @@
 #ifndef IEEE1394_ISO_H
 #define IEEE1394_ISO_H
 
-#include "hosts.h"
+#include <linux/spinlock_types.h>
+#include <asm/atomic.h>
+#include <asm/types.h>
+
 #include "dma.h"
 
+struct hpsb_host;
+
 /* high-level ISO interface */
 
 /*