refresh generic 2.6.23 patches in upstream style

[openwrt.git] / target / linux / x86 / config-2.6.23

diff --git a/target/linux/x86/config-2.6.23 b/target/linux/x86/config-2.6.23
index 88709c7..73927c7 100644 (file)
--- a/target/linux/x86/config-2.6.23
+++ b/target/linux/x86/config-2.6.23
@@ -30,14 +30,9 @@ CONFIG_BASE_SMALL=0
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_HD is not set
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HPT34X is not set
-# CONFIG_BLK_DEV_HPT366 is not set
 CONFIG_BLK_DEV_IDE=y
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_BLK_DEV_IDEDMA_PCI=y
 CONFIG_BLK_DEV_IDEPCI=y
 CONFIG_BLK_DEV_SC1200=y
@@ -62,7 +57,6 @@ CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CRYPTO_AES_586=m
-# CONFIG_CRYPTO_HW is not set
 CONFIG_CRYPTO_TWOFISH_586=m
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
@@ -111,7 +105,6 @@ CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HOSTAP_CS is not set
 # CONFIG_HPET_TIMER is not set
 CONFIG_HT_IRQ=y
 # CONFIG_HUGETLBFS is not set
@@ -138,7 +131,6 @@ CONFIG_IDE=y
 # CONFIG_IDEDMA_IVB is not set
 # CONFIG_IDEDMA_ONLYDISK is not set
 CONFIG_IDEPCI_PCIBUS_ORDER=y
-CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDE_ARM is not set
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y
@@ -159,7 +151,6 @@ CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
@@ -195,10 +186,6 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_INPORT is not set
-# CONFIG_MOUSE_LOGIBM is not set
-# CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -251,22 +238,15 @@ CONFIG_MTD_PARTITIONS=y
 CONFIG_MTRR=y
 # CONFIG_MVIAC3_2 is not set
 # CONFIG_MVIAC7 is not set
-# CONFIG_MWAVE is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
 CONFIG_NETDEV_1000=y
-CONFIG_NET_ACT_POLICE=y
-# CONFIG_NET_ISA is not set
-# CONFIG_NET_SB1000 is not set
-CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_GRE=m
 CONFIG_NOHIGHMEM=y
 # CONFIG_NO_HZ is not set
 CONFIG_NR_CPUS=8
@@ -292,6 +272,8 @@ CONFIG_PCMCIA=m
 CONFIG_PCMCIA_IOCTL=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_PROBE=y
+CONFIG_PCNET32=m
+CONFIG_PCNET32_NAPI=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
@@ -303,7 +285,6 @@ CONFIG_PREEMPT_BKL=y
 CONFIG_QUICKLIST=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_RTC=y
-# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SBC8360_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
@@ -323,9 +304,6 @@ CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_APPLESMC is not set
-# CONFIG_SENSORS_CORETEMP is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -357,7 +335,6 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
-# CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
@@ -373,7 +350,7 @@ CONFIG_USB_UHCI_HCD=m
 # CONFIG_VGASTATE is not set
 CONFIG_VGA_CONSOLE=y
 CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VIDEO_SELECT is not set
 # CONFIG_VIRTUALIZATION is not set
@@ -383,10 +360,6 @@ CONFIG_VORTEX=m
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_W83627HF_WDT is not set
-# CONFIG_W83697HF_WDT is not set
-# CONFIG_W83877F_WDT is not set
-# CONFIG_W83977F_WDT is not set
 # CONFIG_WAFER_WDT is not set
 # CONFIG_WDT is not set
 CONFIG_X86=y