From 0cb7657180f7b234cac37234d788cc99faa29e79 Mon Sep 17 00:00:00 2001
From: James Lentini <jlentini@netapp.com>
Date: Mon, 28 Aug 2006 15:12:04 -0700
Subject: [PATCH] --- yaml --- r: 34319 b: refs/heads/master c:
 2b3e258e5dd1938e2708eb5354ad8ba056fe8154 h: refs/heads/master i:   34317:
 63a10f74a6a2da6974b7c52d9e7d3adf97875cd9   34315:
 cf0d57b6c8d10f010e828be21e10840934969632   34311:
 68a8d9fcfe19d81b780137cb81387ba578a11ace   34303:
 07eaf9d629c4a14e96fad32bca893228e0c2ddd2 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/infiniband/core/mad_priv.h | 1 -
 trunk/drivers/infiniband/core/mad_rmpp.c | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 74dd6973e6f9..dcfb3a389aab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75ab13443e4575c00788ba9861105745b9dda05c
+refs/heads/master: 2b3e258e5dd1938e2708eb5354ad8ba056fe8154
diff --git a/trunk/drivers/infiniband/core/mad_priv.h b/trunk/drivers/infiniband/core/mad_priv.h
index d147f3bad2ce..1da9adbccaec 100644
--- a/trunk/drivers/infiniband/core/mad_priv.h
+++ b/trunk/drivers/infiniband/core/mad_priv.h
@@ -39,7 +39,6 @@
 
 #include <linux/completion.h>
 #include <linux/pci.h>
-#include <linux/kthread.h>
 #include <linux/workqueue.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
diff --git a/trunk/drivers/infiniband/core/mad_rmpp.c b/trunk/drivers/infiniband/core/mad_rmpp.c
index 74fe1af9b18a..3ace5f492dc4 100644
--- a/trunk/drivers/infiniband/core/mad_rmpp.c
+++ b/trunk/drivers/infiniband/core/mad_rmpp.c
@@ -33,8 +33,6 @@
  * $Id: mad_rmpp.c 1921 2005-03-02 22:58:44Z sean.hefty $
  */
 
-#include <linux/dma-mapping.h>
-
 #include "mad_priv.h"
 #include "mad_rmpp.h"