Pull video into test branch

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

diff --git a/drivers/ieee1394/highlevel.h b/drivers/ieee1394/highlevel.h
index 134bb6c3eadb4a69f3aac2203c95082096667560..4b330117067ac7f3d54fec4665a324968e7b148f 100644 (file)
--- a/drivers/ieee1394/highlevel.h
+++ b/drivers/ieee1394/highlevel.h
@@ -1,6 +1,16 @@
 #ifndef IEEE1394_HIGHLEVEL_H
 #define IEEE1394_HIGHLEVEL_H
 
+#include <linux/list.h>
+#include <linux/spinlock_types.h>
+#include <linux/types.h>
+
+struct module;
+
+#include "ieee1394_types.h"
+
+struct hpsb_host;
+
 /* internal to ieee1394 core */
 struct hpsb_address_serve {
        struct list_head host_list;     /* per host list */
@@ -14,7 +24,6 @@ struct hpsb_address_serve {
 /* Only the following structures are of interest to actual highlevel drivers. */
 
 struct hpsb_highlevel {
-       struct module *owner;
        const char *name;
 
        /* Any of the following pointers can legally be NULL, except for