diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-16 16:50:37 -0400 |
| commit | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (patch) | |
| tree | 7e81977adbd73e154f53861d8577d3ab92611c8c /drivers/net/mlx4 | |
| parent | 6684e323a236d40461f27d36b38c6b70aabc9e71 (diff) | |
| parent | 7b104bcb8e460e45a1aebe3da9b86aacdb4cab12 (diff) | |
| download | linux-55d3ecab2d16be3525ba24a96ba3a67692af1f09.tar.gz linux-55d3ecab2d16be3525ba24a96ba3a67692af1f09.tar.bz2 linux-55d3ecab2d16be3525ba24a96ba3a67692af1f09.zip | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/mlx4')
| -rw-r--r-- | drivers/net/mlx4/alloc.c | 1 | ||||
| -rw-r--r-- | drivers/net/mlx4/eq.c | 1 | ||||
| -rw-r--r-- | drivers/net/mlx4/icm.c | 1 | ||||
| -rw-r--r-- | drivers/net/mlx4/reset.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c index 9ffdb9d29da9..dfbd5809d744 100644 --- a/drivers/net/mlx4/alloc.c +++ b/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/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c index af016d0ea1c6..0f11adb8eb4a 100644 --- a/drivers/net/mlx4/eq.c +++ b/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/drivers/net/mlx4/icm.c b/drivers/net/mlx4/icm.c index e96feaed6ed4..b7a4aa8476fb 100644 --- a/drivers/net/mlx4/icm.c +++ b/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/drivers/net/mlx4/reset.c b/drivers/net/mlx4/reset.c index 51eef8492e93..e4dfd4b11a4a 100644 --- a/drivers/net/mlx4/reset.c +++ b/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" |