From 56f6de4395900258da6aa0264ca45aa85019fdc1 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Fri, 16 Nov 2012 14:14:56 -0800 Subject: [PATCH] --- yaml --- r: 335792 b: refs/heads/master c: 2ca3cb50edc351875df13d083524f524cdeb3054 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rapidio/rio.c | 2 +- trunk/include/linux/rio.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c6265f9817c3..d7415ae95318 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f58b59c1df3cb990d644018e1461cd4acd3c1700 +refs/heads/master: 2ca3cb50edc351875df13d083524f524cdeb3054 diff --git a/trunk/drivers/rapidio/rio.c b/trunk/drivers/rapidio/rio.c index c17ae22567e0..0c6fcb461faf 100644 --- a/trunk/drivers/rapidio/rio.c +++ b/trunk/drivers/rapidio/rio.c @@ -401,7 +401,7 @@ EXPORT_SYMBOL_GPL(rio_release_inb_pwrite); /** * rio_map_inb_region -- Map inbound memory region. * @mport: Master port. - * @lstart: physical address of memory region to be mapped + * @local: physical address of memory region to be mapped * @rbase: RIO base address assigned to this window * @size: Size of the memory region * @rflags: Flags for mapping. diff --git a/trunk/include/linux/rio.h b/trunk/include/linux/rio.h index 4187da511006..a3e784278667 100644 --- a/trunk/include/linux/rio.h +++ b/trunk/include/linux/rio.h @@ -275,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 */