Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / include / linux / rio.h

diff --git a/include/linux/rio.h b/include/linux/rio.h
index d2dff22cf681bf6a0eee8789a5448cb5a17459e5..a3e7842786679567185ecdbc8835fd5936fb36f4 100644 (file)
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -63,7 +63,7 @@
  *
  *     0       RapidIO inbound doorbells
  *     1       RapidIO inbound mailboxes
- *     1       RapidIO outbound mailboxes
+ *     2       RapidIO outbound mailboxes
  */
 #define RIO_DOORBELL_RESOURCE  0
 #define RIO_INB_MBOX_RESOURCE  1
@@ -266,7 +266,6 @@ struct rio_mport {
 
 struct rio_id_table {
        u16 start;      /* logical minimal id */
-       u16 next;       /* hint for find */
        u32 max;        /* max number of IDs in table */
        spinlock_t lock;
        unsigned long *table;
@@ -276,9 +275,11 @@ struct rio_id_table {
  * struct rio_net - RIO network info
  * @node: Node in global list of RIO networks
  * @devices: List of devices in this network
+ * @switches: List of switches in this netowrk
  * @mports: List of master ports accessing this network
  * @hport: Default port for accessing this network
  * @id: RIO network ID
+ * @destid_table: destID allocation table
  */
 struct rio_net {
        struct list_head node;  /* node in list of networks */