Merge branch 'for-linus' of git://www.jni.nu/cris

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / mthca / mthca_provider.h

diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h
index 1d266ac2e094c404d2cd8d3167261c07e20c0f6d..c621f8794b8820d11e6293d62c2ce35d11e8e7ee 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@@ -30,8 +30,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id: mthca_provider.h 1349 2004-12-16 21:09:43Z roland $
  */
 
 #ifndef MTHCA_PROVIDER_H
@@ -67,12 +65,14 @@ struct mthca_ucontext {
        struct ib_ucontext          ibucontext;
        struct mthca_uar            uar;
        struct mthca_user_db_table *db_tab;
+       int                         reg_mr_warned;
 };
 
 struct mthca_mtt;
 
 struct mthca_mr {
        struct ib_mr      ibmr;
+       struct ib_umem   *umem;
        struct mthca_mtt *mtt;
 };