From 144ebddd610f5d9fa8bc8b162537ce438641422d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 16 Feb 2007 19:51:27 +0000
Subject: [PATCH] add e1000 support

SVN-Revision: 6315
---
 package/kernel/modules/network.mk |  1 +
 target/linux/x86-2.6/config       | 57 ++-----------------------------
 target/linux/x86-2.6/config-diff  |  5 +--
 3 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 716dd8bf25..ec307b6506 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -363,6 +363,7 @@ define KernelPackage/e1000
   KCONFIG:=$(CONFIG_E1000)
   DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,e1000)
 endef
 $(eval $(call KernelPackage,e1000))
 
diff --git a/target/linux/x86-2.6/config b/target/linux/x86-2.6/config
index 154275dd68..dde3cac927 100644
--- a/target/linux/x86-2.6/config
+++ b/target/linux/x86-2.6/config
@@ -71,7 +71,6 @@ CONFIG_AX25=m
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
-# CONFIG_BASLER_EXCITE is not set
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
 CONFIG_BCM43XX=m
@@ -196,7 +195,6 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUSB=m
 CONFIG_BT_HCIUSB_SCO=y
 CONFIG_BT_HCIVHCI=m
-CONFIG_BT_HIDP=m
 CONFIG_BT_L2CAP=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -214,18 +212,15 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_CHR_DEV_SCH is not set
 # CONFIG_CHR_DEV_SG is not set
 # CONFIG_CHR_DEV_ST is not set
-# CONFIG_CICADA_PHY is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_XATTR is not set
 CONFIG_CLS_U32_MARK=y
 CONFIG_CLS_U32_PERF=y
-CONFIG_CMDLINE=""
 # CONFIG_CODA_FS is not set
 CONFIG_COMPAT_VDSO=y
 CONFIG_CONFIGFS_FS=y
@@ -247,7 +242,6 @@ CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CRC16=m
 CONFIG_CRC32=y
 CONFIG_CRC_CCITT=m
-CONFIG_CROSSCOMPILE=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_AES_586=m
@@ -285,7 +279,6 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_WP512=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
-# CONFIG_DAVICOM_PHY is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_FS is not set
@@ -322,7 +315,9 @@ CONFIG_DOUBLEFAULT=y
 # CONFIG_DUMMY is not set
 # CONFIG_DVB is not set
 CONFIG_E100=m
-# CONFIG_E1000 is not set
+CONFIG_E1000=m
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000_NAPI=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_ECONET is not set
 # CONFIG_EDAC is not set
@@ -510,24 +505,11 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y
 CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_INPUT is not set
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MISC is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_TSDEV is not set
 # CONFIG_IOSCHED_AS is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
@@ -701,7 +683,6 @@ CONFIG_JOLIET=y
 CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_LAPB is not set
-# CONFIG_LASAT is not set
 # CONFIG_LBD is not set
 # CONFIG_LDM_PARTITION is not set
 CONFIG_LEDS_CLASS=y
@@ -721,7 +702,6 @@ CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_LSF is not set
-# CONFIG_LXT_PHY is not set
 # CONFIG_M386 is not set
 CONFIG_M486=y
 # CONFIG_M586 is not set
@@ -731,8 +711,6 @@ CONFIG_M486=y
 # CONFIG_MACHZ_WDT is not set
 CONFIG_MAC_PARTITION=y
 # CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_MARKEINS is not set
-# CONFIG_MARVELL_PHY is not set
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MCA is not set
 # CONFIG_MCRUSOE is not set
@@ -868,7 +846,6 @@ CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_IND=y
-CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_CLS_ROUTE=y
 CONFIG_NET_CLS_ROUTE4=m
 CONFIG_NET_CLS_RSVP=m
@@ -1053,15 +1030,11 @@ CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
-# CONFIG_QEMU is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QUOTA is not set
 # CONFIG_R3964 is not set
 # CONFIG_R8169 is not set
-# CONFIG_RADIO_GEMTEK_PCI is not set
-# CONFIG_RADIO_MAESTRO is not set
-# CONFIG_RADIO_MAXIRADIO is not set
 # CONFIG_RAID_ATTRS is not set
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
@@ -1301,7 +1274,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VXPOCKET is not set
 # CONFIG_SND_WAVEFRONT is not set
 # CONFIG_SND_YMFPCI is not set
-# CONFIG_SNI_RM200_PCI is not set
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SOLARIS_X86_PARTITION is not set
 CONFIG_SOUND=m
@@ -1377,20 +1349,15 @@ CONFIG_UNIX98_PTYS=y
 # CONFIG_UNWIND_INFO is not set
 CONFIG_USB=m
 # CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_ADUTUX is not set
-# CONFIG_USB_AIPTEK is not set
 CONFIG_USB_ALI_M5632=y
 CONFIG_USB_AN2720=y
 # CONFIG_USB_APPLEDISPLAY is not set
-# CONFIG_USB_APPLETOUCH is not set
 CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARMLINUX=y
-# CONFIG_USB_ATI_REMOTE is not set
-# CONFIG_USB_ATI_REMOTE2 is not set
 CONFIG_USB_ATM=m
 # CONFIG_USB_AUERSWALD is not set
 # CONFIG_USB_BANDWIDTH is not set
@@ -1402,7 +1369,6 @@ CONFIG_USB_CATC=m
 # CONFIG_USB_DABUSB is not set
 # CONFIG_USB_DEBUG is not set
 CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DSBR is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
@@ -1418,9 +1384,6 @@ CONFIG_USB_EZUSB=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_ISP116X_HCD is not set
 CONFIG_USB_KAWETH=m
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_KBTAB is not set
-# CONFIG_USB_KEYSPAN_REMOTE is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_LED is not set
@@ -1429,7 +1392,6 @@ CONFIG_USB_KAWETH=m
 # CONFIG_USB_MDC800 is not set
 # CONFIG_USB_MICROTEK is not set
 # CONFIG_USB_MON is not set
-# CONFIG_USB_MOUSE is not set
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_SUBSET=m
@@ -1445,7 +1407,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_OTG is not set
 CONFIG_USB_PEGASUS=m
 # CONFIG_USB_PHIDGET is not set
-# CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_RTL8150=m
@@ -1511,21 +1472,16 @@ CONFIG_USB_STORAGE_FREECOM=y
 # CONFIG_USB_STORAGE_ISD200 is not set
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_KARMA=y
-# CONFIG_USB_STORAGE_ONETOUCH is not set
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
 CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_TEST is not set
-# CONFIG_USB_TOUCHSCREEN is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_USBNET_MII=m
-# CONFIG_USB_WACOM is not set
-# CONFIG_USB_XPAD is not set
 # CONFIG_USB_XUSBATM is not set
-# CONFIG_USB_YEALINK is not set
 CONFIG_USB_ZD1201=m
 # CONFIG_UTS_NS is not set
 CONFIG_VFAT_FS=m
@@ -1533,13 +1489,7 @@ CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
 CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VIA_VELOCITY is not set
-# CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_V4L1 is not set
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VITESSE_PHY is not set
 CONFIG_VLAN_8021Q=y
 # CONFIG_VM86 is not set
 # CONFIG_VMSPLIT_1G is not set
@@ -1564,7 +1514,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_WDT is not set
 # CONFIG_WDTPCI is not set
 CONFIG_WIRELESS_EXT=y
-# CONFIG_WR_PPMC is not set
 # CONFIG_X25 is not set
 CONFIG_X86=y
 CONFIG_X86_32=y
diff --git a/target/linux/x86-2.6/config-diff b/target/linux/x86-2.6/config-diff
index eb8f9d1246..768947ae7f 100644
--- a/target/linux/x86-2.6/config-diff
+++ b/target/linux/x86-2.6/config-diff
@@ -96,6 +96,9 @@ CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_DMASCC is not set
 CONFIG_DMI=y
 CONFIG_DOUBLEFAULT=y
+CONFIG_E1000=m
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000_NAPI=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_EDAC is not set
 # CONFIG_EDD is not set
@@ -175,8 +178,6 @@ CONFIG_IDEPCI_SHARE_IRQ=y
 CONFIG_IDE_GENERIC=y
 CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_INITRAMFS_ROOT_GID=0
-CONFIG_INITRAMFS_ROOT_UID=0
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_ISA=y
 CONFIG_ISAPNP=y