diff options
| author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
| commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
| tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /drivers/net/Makefile | |
| parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
| parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
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 98409c9dd445..edc9a0d6171d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -220,6 +220,7 @@ obj-$(CONFIG_R8169) += r8169.o | |||
| 220 | obj-$(CONFIG_AMD8111_ETH) += amd8111e.o | 220 | obj-$(CONFIG_AMD8111_ETH) += amd8111e.o |
| 221 | obj-$(CONFIG_IBMVETH) += ibmveth.o | 221 | obj-$(CONFIG_IBMVETH) += ibmveth.o |
| 222 | obj-$(CONFIG_S2IO) += s2io.o | 222 | obj-$(CONFIG_S2IO) += s2io.o |
| 223 | obj-$(CONFIG_VXGE) += vxge/ | ||
| 223 | obj-$(CONFIG_MYRI10GE) += myri10ge/ | 224 | obj-$(CONFIG_MYRI10GE) += myri10ge/ |
| 224 | obj-$(CONFIG_SMC91X) += smc91x.o | 225 | obj-$(CONFIG_SMC91X) += smc91x.o |
| 225 | obj-$(CONFIG_SMC911X) += smc911x.o | 226 | obj-$(CONFIG_SMC911X) += smc911x.o |