CONFIG_NF_CT_ACCT is deprecated in 2.6.27

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

diff --git a/target/linux/x86/config-2.6.25 b/target/linux/x86/config-2.6.25
index de9404d..c828144 100644 (file)
--- a/target/linux/x86/config-2.6.25
+++ b/target/linux/x86/config-2.6.25
@@ -15,6 +15,7 @@ CONFIG_AC97_BUS=m
 # CONFIG_ALIM1535_WDT is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_APRICOT is not set
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -49,6 +50,7 @@ CONFIG_BLK_DEV_IDEDMA_SFF=y
 CONFIG_BLK_DEV_IDEPCI=y
 # CONFIG_BLK_DEV_QD65XX is not set
 CONFIG_BLK_DEV_SC1200=y
+# CONFIG_BLK_DEV_SL82C105 is not set
 # CONFIG_BLK_DEV_UMC8672 is not set
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_BLK_DEV_XD is not set
@@ -94,7 +96,6 @@ CONFIG_DNOTIFY=y
 CONFIG_DOUBLEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_E1000=m
-# CONFIG_E1000E is not set
 # CONFIG_E1000E_ENABLED is not set
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 CONFIG_E1000_NAPI=y
@@ -174,9 +175,9 @@ CONFIG_IDEPCI_PCIBUS_ORDER=y
 CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_PROC_FS is not set
-# CONFIG_IGB is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
+CONFIG_INPUT_APANEL=n
 # CONFIG_INPUT_EVDEV is not set
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_MOUSE=y
@@ -193,7 +194,6 @@ CONFIG_IO_DELAY_TYPE_0XED=1
 CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IP1000 is not set
 # CONFIG_IPWIRELESS is not set
 CONFIG_IRQBALANCE=y
 CONFIG_ISA=y
@@ -303,7 +303,6 @@ CONFIG_MTRR=y
 CONFIG_NAMESPACES=y
 CONFIG_NATSEMI=m
 CONFIG_NE2K_PCI=m
-CONFIG_NETDEV_1000=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
@@ -318,9 +317,9 @@ CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m
 CONFIG_PCCARD_NONSTATIC=m
+CONFIG_PCI=y
 # CONFIG_PCIEPORTBUS is not set
 # CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
@@ -415,8 +414,8 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TOSHIBA is not set
 # CONFIG_TYPHOON is not set
 CONFIG_UID16=y
-# CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB=m
+# CONFIG_USBPCWATCHDOG is not set
 CONFIG_USB_EHCI_HCD=m
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -424,6 +423,7 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_SERIAL_OTI6858 is not set
+CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USER_NS is not set
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set