diff --git a/[refs] b/[refs] index 4caad8bd181e..df7fdf653fd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed43f44f868045baa27bc140db0d4898e9695d07 +refs/heads/master: fe50c927d7ab17983ab05d3e29e73395dcd577b6 diff --git a/trunk/include/linux/rio.h b/trunk/include/linux/rio.h index 1a7b6c7787a5..ba382f2b57ef 100644 --- a/trunk/include/linux/rio.h +++ b/trunk/include/linux/rio.h @@ -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 */ @@ -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