diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-03 10:35:09 -0400 |
| commit | 484cad34dd667235565c14a40e2f5a8143184aaa (patch) | |
| tree | 70bb901671958960a64d7f383c902178b4b49558 /drivers/net/Makefile | |
| parent | 95a38f34635bdf06089de763b4becbc957694977 (diff) | |
| parent | 67796bf7dc54c035fd97f2681a72e5d2bf2a234a (diff) | |
Merge branch 'dma-debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
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 |