diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-24 18:36:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-24 18:36:04 +0000 |
| commit | 010faa438177e9ce6e96cde78f907411688dffa7 (patch) | |
| tree | 706616df53c80112eb91f02f31a00c5b228f0700 | |
| parent | 426ecdecef992cf396ab94ed1a22da133f7a30e1 (diff) | |
| download | upstream-010faa438177e9ce6e96cde78f907411688dffa7.tar.gz upstream-010faa438177e9ce6e96cde78f907411688dffa7.tar.bz2 upstream-010faa438177e9ce6e96cde78f907411688dffa7.zip | |
add e1000 driver, remove references to LINUX_2_4_X86
SVN-Revision: 5286
| -rw-r--r-- | package/kernel/modules/network.mk | 21 | ||||
| -rw-r--r-- | target/linux/x86-2.6/config | 4 |
2 files changed, 19 insertions, 6 deletions
diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk index bbb6d9b829..c85a4c78fd 100644 --- a/package/kernel/modules/network.mk +++ b/package/kernel/modules/network.mk @@ -264,7 +264,7 @@ define KernelPackage/sis900 Kernel modules for Sis 900 Ethernet adapters. FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_SIS900) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) AUTOLOAD:=$(call AutoLoad,50,sis900) endef @@ -276,7 +276,7 @@ define KernelPackage/via-rhine Kernel modules for Via Rhine Ethernet chipsets. FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_VIA_RHINE) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) AUTOLOAD:=$(call AutoLoad,50,via-rhine) endef @@ -288,7 +288,7 @@ define KernelPackage/8139too Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters. FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_8139TOO) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) AUTOLOAD:=$(call AutoLoad,50,8139too) endef @@ -300,12 +300,23 @@ define KernelPackage/e100 Kernel modules for Intel(R) PRO/100+ Ethernet adapters. FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_E100) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) AUTOLOAD:=$(call AutoLoad,50,e100) endef $(eval $(call KernelPackage,e100)) +define KernelPackage/e1000 + TITLE:=Intel(R) PRO/1000 cards kernel support + DESCRIPTION:=\ + Kernel modules for Intel(R) PRO/1000 Ethernet adapters. + FILES:=$(MODULES_DIR)/kernel/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_E1000) + DEPENDS:=@LINUX_2_6_X86 + SUBMENU:=$(NDMENU) +endef +$(eval $(call KernelPackage,e1000)) + define KernelPackage/3c59x TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang DESCRIPTION:=\ @@ -318,7 +329,7 @@ define KernelPackage/3c59x - "Hurricane" (3c555/3cSOHO) PCI FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_3C59X) - DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) AUTOLOAD:=$(call AutoLoad,50,3c59x) endef diff --git a/target/linux/x86-2.6/config b/target/linux/x86-2.6/config index ca967af55d..6128ea592f 100644 --- a/target/linux/x86-2.6/config +++ b/target/linux/x86-2.6/config @@ -1054,7 +1054,9 @@ CONFIG_VIA_RHINE=m # # CONFIG_ACENIC is not set # CONFIG_DL2K is not set -# CONFIG_E1000 is not set +CONFIG_E1000=m +# CONFIG_E1000_NAPI is not set +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set |