Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstream' into...

[firefly-linux-kernel-4.4.55.git] / include / rdma / ib_fmr_pool.h

diff --git a/include/rdma/ib_fmr_pool.h b/include/rdma/ib_fmr_pool.h
index 00dadbf94e1d75cca1d9004a9b997efe3eb103c6..f62b842e6596142750d476ef5f6ce606f253ab43 100644 (file)
--- a/include/rdma/ib_fmr_pool.h
+++ b/include/rdma/ib_fmr_pool.h
@@ -29,8 +29,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: ib_fmr_pool.h 2730 2005-06-28 16:43:03Z sean.hefty $
  */
 
 #if !defined(IB_FMR_POOL_H)
@@ -61,7 +59,7 @@ struct ib_fmr_pool_param {
        int                     pool_size;
        int                     dirty_watermark;
        void                  (*flush_function)(struct ib_fmr_pool *pool,
-                                               void *              arg);
+                                               void               *arg);
        void                   *flush_arg;
        unsigned                cache:1;
 };