Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330166
b: refs/heads/master
c: fe50c92
h: refs/heads/master
v: v3
  • Loading branch information
Alexandre Bounine authored and Linus Torvalds committed Oct 5, 2012
1 parent 4c33443 commit 23f8cd8
Show file tree
Hide file tree
Showing 2 changed files with 3 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: ed43f44f868045baa27bc140db0d4898e9695d07
refs/heads/master: fe50c927d7ab17983ab05d3e29e73395dcd577b6
3 changes: 2 additions & 1 deletion trunk/include/linux/rio.h
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ enum rio_phy_type {
* @phys_efptr: RIO port extended features pointer
* @name: Port name string
* @priv: Master port private data
* @dma: DMA device associated with mport
*/
struct rio_mport {
struct list_head dbells; /* list of doorbell events */
Expand Down Expand Up @@ -404,7 +405,7 @@ union rio_pw_msg {

#ifdef CONFIG_RAPIDIO_DMA_ENGINE

/**
/*
* enum rio_write_type - RIO write transaction types used in DMA transfers
*
* Note: RapidIO specification defines write (NWRITE) and
Expand Down

0 comments on commit 23f8cd8

Please sign in to comment.