From e69b5491458c019ec4ffa650b3e74f157c4d7950 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Tue, 15 May 2007 20:36:30 +0100
Subject: [PATCH] --- yaml --- r: 56461 b: refs/heads/master c:
 9cbe05c71251b51607d80256c3b3754957bb5ed8 h: refs/heads/master i:   56459:
 78c67446beb6ff66703d9e3abe3183b64f814b66 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/mlx4/alloc.c | 1 +
 trunk/drivers/net/mlx4/eq.c    | 1 +
 trunk/drivers/net/mlx4/icm.c   | 1 +
 trunk/drivers/net/mlx4/reset.c | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c72e40b7a4bf..6a583d33bd84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a86edef395576f69d2513c62aea7c966043bc8d
+refs/heads/master: 9cbe05c71251b51607d80256c3b3754957bb5ed8
diff --git a/trunk/drivers/net/mlx4/alloc.c b/trunk/drivers/net/mlx4/alloc.c
index 9ffdb9d29da9..dfbd5809d744 100644
--- a/trunk/drivers/net/mlx4/alloc.c
+++ b/trunk/drivers/net/mlx4/alloc.c
@@ -33,6 +33,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>
 #include <linux/bitmap.h>
+#include <linux/dma-mapping.h>
 
 #include "mlx4.h"
 
diff --git a/trunk/drivers/net/mlx4/eq.c b/trunk/drivers/net/mlx4/eq.c
index af016d0ea1c6..0f11adb8eb4a 100644
--- a/trunk/drivers/net/mlx4/eq.c
+++ b/trunk/drivers/net/mlx4/eq.c
@@ -33,6 +33,7 @@
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
 
 #include <linux/mlx4/cmd.h>
 
diff --git a/trunk/drivers/net/mlx4/icm.c b/trunk/drivers/net/mlx4/icm.c
index e96feaed6ed4..b7a4aa8476fb 100644
--- a/trunk/drivers/net/mlx4/icm.c
+++ b/trunk/drivers/net/mlx4/icm.c
@@ -33,6 +33,7 @@
 
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/mm.h>
 
 #include <linux/mlx4/cmd.h>
 
diff --git a/trunk/drivers/net/mlx4/reset.c b/trunk/drivers/net/mlx4/reset.c
index 51eef8492e93..e4dfd4b11a4a 100644
--- a/trunk/drivers/net/mlx4/reset.c
+++ b/trunk/drivers/net/mlx4/reset.c
@@ -35,6 +35,7 @@
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
+#include <linux/jiffies.h>
 
 #include "mlx4.h"