diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 22:40:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 22:40:09 -0400 |
| commit | de5603748af8bf7deac403e6ba92887f8d18e812 (patch) | |
| tree | fd93862c70ec0eeba5fe340d7519ab33a9cb1dff /drivers/net/Makefile | |
| parent | b5f0adbcc4f16e378882d8f68fe3111df04911be (diff) | |
| parent | 225c7b1feef1b41170f7037a5b10a65cd8a42c54 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/mlx4: Add a driver Mellanox ConnectX InfiniBand adapters
IB: Put rlimit accounting struct in struct ib_umem
IB/uverbs: Export ib_umem_get()/ib_umem_release() to modules
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index c5d8423573b6..a77affa4f6e6 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -197,6 +197,7 @@ obj-$(CONFIG_SMC911X) += smc911x.o | |||
| 197 | obj-$(CONFIG_DM9000) += dm9000.o | 197 | obj-$(CONFIG_DM9000) += dm9000.o |
| 198 | obj-$(CONFIG_FEC_8XX) += fec_8xx/ | 198 | obj-$(CONFIG_FEC_8XX) += fec_8xx/ |
| 199 | obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o | 199 | obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o |
| 200 | obj-$(CONFIG_MLX4_CORE) += mlx4/ | ||
| 200 | 201 | ||
| 201 | obj-$(CONFIG_MACB) += macb.o | 202 | obj-$(CONFIG_MACB) += macb.o |
| 202 | 203 | ||