diff options
author | 2009-09-11 20:35:13 -0700 | |
---|---|---|
committer | 2009-09-11 20:35:13 -0700 | |
commit | cabc5c0f7fa1342049042d6e147db5a73773955b (patch) | |
tree | 2be09ae1777d580c7dfe05d6d5b76e57281ec447 /drivers/net/mlx4/profile.c | |
parent | sparc64: Initial niagara2 perf counter support. (diff) | |
parent | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
download | linux-dev-cabc5c0f7fa1342049042d6e147db5a73773955b.tar.xz linux-dev-cabc5c0f7fa1342049042d6e147db5a73773955b.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
arch/sparc/Kconfig
Diffstat (limited to 'drivers/net/mlx4/profile.c')
-rw-r--r-- | drivers/net/mlx4/profile.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/mlx4/profile.c index bd22df95adf9..ca25b9dc8378 100644 --- a/drivers/net/mlx4/profile.c +++ b/drivers/net/mlx4/profile.c @@ -32,8 +32,6 @@ * SOFTWARE. */ -#include <linux/init.h> - #include "mlx4.h" #include "fw.h" |