diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 14:00:25 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-17 14:00:25 +0000 |
| commit | d95fa260a38635afc1011064a26d7d70392f1552 (patch) | |
| tree | 4aff93409af55331061b7734b68bc241157cab03 /target/linux | |
| parent | 4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb (diff) | |
| download | upstream-d95fa260a38635afc1011064a26d7d70392f1552.tar.gz upstream-d95fa260a38635afc1011064a26d7d70392f1552.tar.bz2 upstream-d95fa260a38635afc1011064a26d7d70392f1552.zip | |
sync kernel config
SVN-Revision: 11524
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/x86/config-2.6.25 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/target/linux/x86/config-2.6.25 b/target/linux/x86/config-2.6.25 index fbb95e1806..cf4344e747 100644 --- 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 @@ -94,7 +95,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,10 +174,8 @@ 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 is not set # CONFIG_INPUT_EVDEV is not set CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_MOUSE=y @@ -194,7 +192,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 @@ -304,7 +301,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 @@ -319,9 +315,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 @@ -416,8 +412,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 |