git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[pandora-kernel.git]
/
drivers
/
net
/
mlx4
/
Makefile
diff --git
a/drivers/net/mlx4/Makefile
b/drivers/net/mlx4/Makefile
index
21040a0
..
1fd068e
100644
(file)
--- a/
drivers/net/mlx4/Makefile
+++ b/
drivers/net/mlx4/Makefile
@@
-5,5
+5,5
@@
mlx4_core-y := alloc.o catas.o cmd.o cq.o eq.o fw.o icm.o intf.o main.o mcg.o \
obj-$(CONFIG_MLX4_EN) += mlx4_en.o
obj-$(CONFIG_MLX4_EN) += mlx4_en.o
-mlx4_en-y := en_main.o en_tx.o en_rx.o en_
params
.o en_port.o en_cq.o \
+mlx4_en-y := en_main.o en_tx.o en_rx.o en_
ethtool
.o en_port.o en_cq.o \
en_resources.o en_netdev.o
en_resources.o en_netdev.o