parisc: sba_iommu: fix build bug when CONFIG_PARISC_AGP=y

[mv-sheeva.git] / drivers / firewire / fw-topology.h

diff --git a/drivers/firewire/fw-topology.h b/drivers/firewire/fw-topology.h
index da61ec09183e230b857652e4a61a125b78aa3dd4..addb9f8ea776f1196dd7f65b6f75cd3695d13425 100644 (file)
--- a/drivers/firewire/fw-topology.h
+++ b/drivers/firewire/fw-topology.h
@@ -20,15 +20,12 @@
 #define __fw_topology_h
 
 enum {
-       FW_NODE_CREATED =   0x00,
-       FW_NODE_UPDATED =   0x01,
-       FW_NODE_DESTROYED = 0x02,
-       FW_NODE_LINK_ON =   0x03,
-       FW_NODE_LINK_OFF =  0x04,
-};
-
-struct fw_port {
-       struct fw_node *node;
+       FW_NODE_CREATED,
+       FW_NODE_UPDATED,
+       FW_NODE_DESTROYED,
+       FW_NODE_LINK_ON,
+       FW_NODE_LINK_OFF,
+       FW_NODE_INITIATED_RESET,
 };
 
 struct fw_node {
@@ -51,15 +48,9 @@ struct fw_node {
        /* Upper layer specific data. */
        void *data;
 
-       struct fw_port ports[0];
+       struct fw_node *ports[0];
 };
 
-static inline struct fw_node *
-fw_node(struct list_head *l)
-{
-       return list_entry(l, struct fw_node, link);
-}
-
 static inline struct fw_node *
 fw_node_get(struct fw_node *node)
 {