diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/net/Makefile | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
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 1c378dd5933e..d366fb2b40e9 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -75,6 +75,7 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o | |||
| 75 | obj-$(CONFIG_FEALNX) += fealnx.o | 75 | obj-$(CONFIG_FEALNX) += fealnx.o |
| 76 | obj-$(CONFIG_TIGON3) += tg3.o | 76 | obj-$(CONFIG_TIGON3) += tg3.o |
| 77 | obj-$(CONFIG_BNX2) += bnx2.o | 77 | obj-$(CONFIG_BNX2) += bnx2.o |
| 78 | obj-$(CONFIG_CNIC) += cnic.o | ||
| 78 | obj-$(CONFIG_BNX2X) += bnx2x.o | 79 | obj-$(CONFIG_BNX2X) += bnx2x.o |
| 79 | bnx2x-objs := bnx2x_main.o bnx2x_link.o | 80 | bnx2x-objs := bnx2x_main.o bnx2x_link.o |
| 80 | spidernet-y += spider_net.o spider_net_ethtool.o | 81 | spidernet-y += spider_net.o spider_net_ethtool.o |