diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-31 11:50:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-31 11:50:32 -0400 |
| commit | edb3e182b6f33c91ba8778e2198220c12712d3ad (patch) | |
| tree | 6b741e144c2c83e901a325e5373dc0b8baf88534 /drivers/net/Makefile | |
| parent | 8973a585aec125beb2a3de50bb491004299f53d5 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
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 e038d55e4f6f..30c7567001fe 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
| @@ -51,6 +51,7 @@ obj-$(CONFIG_NS83820) += ns83820.o | |||
| 51 | obj-$(CONFIG_STNIC) += stnic.o 8390.o | 51 | obj-$(CONFIG_STNIC) += stnic.o 8390.o |
| 52 | obj-$(CONFIG_FEALNX) += fealnx.o | 52 | obj-$(CONFIG_FEALNX) += fealnx.o |
| 53 | obj-$(CONFIG_TIGON3) += tg3.o | 53 | obj-$(CONFIG_TIGON3) += tg3.o |
| 54 | obj-$(CONFIG_BNX2) += bnx2.o | ||
| 54 | obj-$(CONFIG_TC35815) += tc35815.o | 55 | obj-$(CONFIG_TC35815) += tc35815.o |
| 55 | obj-$(CONFIG_SK98LIN) += sk98lin/ | 56 | obj-$(CONFIG_SK98LIN) += sk98lin/ |
| 56 | obj-$(CONFIG_SKFP) += skfp/ | 57 | obj-$(CONFIG_SKFP) += skfp/ |