diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 22:48:14 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 22:48:14 -0500 |
| commit | 06d61cbf7c2522f43c09d5bb050acd0bd31812c0 (patch) | |
| tree | 2ce1fb910566961de2d2ff1f2f01a9c0546d8092 /drivers/net/Makefile | |
| parent | 34afd638d0b0698e66b6aa4f749face019a3e90f (diff) | |
| parent | d0bbccfa3297d3ef6ae4691585abde9a6c26b186 (diff) | |
| download | talos-obmc-linux-06d61cbf7c2522f43c09d5bb050acd0bd31812c0.tar.gz talos-obmc-linux-06d61cbf7c2522f43c09d5bb050acd0bd31812c0.zip | |
Merge branch 'sky2'
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 4cffd34442aa..27822a2f0683 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -59,6 +59,7 @@ spidernet-y += spider_net.o spider_net_ethtool.o sungem_phy.o obj-$(CONFIG_SPIDER_NET) += spidernet.o obj-$(CONFIG_TC35815) += tc35815.o obj-$(CONFIG_SKGE) += skge.o +obj-$(CONFIG_SKY2) += sky2.o obj-$(CONFIG_SK98LIN) += sk98lin/ obj-$(CONFIG_SKFP) += skfp/ obj-$(CONFIG_VIA_RHINE) += via-rhine.o |
