Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 335792
b: refs/heads/master
c: 2ca3cb5
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Nov 16, 2012
1 parent 84589b2 commit 56f6de4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f58b59c1df3cb990d644018e1461cd4acd3c1700
refs/heads/master: 2ca3cb50edc351875df13d083524f524cdeb3054
2 changes: 1 addition & 1 deletion trunk/drivers/rapidio/rio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/linux/rio.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 56f6de4

Please sign in to comment.