diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /drivers/net/Makefile | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
| download | linux-stable-344a076110f4ecb16ea6d286b63be696604982ed.tar.gz linux-stable-344a076110f4ecb16ea6d286b63be696604982ed.tar.bz2 linux-stable-344a076110f4ecb16ea6d286b63be696604982ed.zip | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/net/Makefile')
| -rw-r--r-- | drivers/net/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5baafcd55610..8645c843cf4d 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -54,6 +54,8 @@ obj-$(CONFIG_STNIC) += stnic.o 8390.o obj-$(CONFIG_FEALNX) += fealnx.o obj-$(CONFIG_TIGON3) += tg3.o obj-$(CONFIG_BNX2) += bnx2.o +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_SK98LIN) += sk98lin/ |