merge r14497, r14498 to 8.09

[openwrt/svn-archive/archive.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 c828144713acff8d993b2da85e2a5841a9bfe14f..9889e3b08ab926c847a9abf01ee4a46adb1aabd0 100644 (file)
--- a/target/linux/x86/config-2.6.25
+++ b/target/linux/x86/config-2.6.25
@@ -50,7 +50,6 @@ 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
@@ -90,6 +89,7 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set
+# CONFIG_DMASCC is not set
 CONFIG_DMI=y
 # CONFIG_DMIID is not set
 CONFIG_DNOTIFY=y
@@ -125,7 +125,6 @@ CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_GENERIC_LOCKBREAK is not set
-CONFIG_GENERIC_PENDING_IRQ=y
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
@@ -177,7 +176,6 @@ CONFIG_IDE_GENERIC=y
 # CONFIG_IDE_PROC_FS 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
@@ -195,7 +193,6 @@ CONFIG_IO_DELAY_TYPE_NONE=3
 CONFIG_IO_DELAY_TYPE_UDELAY=2
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IPWIRELESS is not set
-CONFIG_IRQBALANCE=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
@@ -217,7 +214,6 @@ CONFIG_KTIME_SCALAR=y
 # CONFIG_LEDS_CLEVO_MAIL is not set
 CONFIG_LEDS_NET48XX=m
 # CONFIG_LEDS_WRAP is not set
-CONFIG_LOCK_KERNEL=y
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
 CONFIG_M386=y
@@ -307,9 +303,9 @@ CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NOHIGHMEM=y
-CONFIG_NR_CPUS=8
 CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y
+# CONFIG_OCF_OCF is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 # CONFIG_PATA_CS5536 is not set
@@ -354,9 +350,7 @@ CONFIG_SC1200_WDT=m
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCC is not set
 # CONFIG_SCHED_HRTICK is not set
-CONFIG_SCHED_MC=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_SCHED_SMT=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 CONFIG_SCSI_WAIT_SCAN=m
 CONFIG_SCx200=y
@@ -368,7 +362,6 @@ CONFIG_SCx200_I2C_SCL=12
 CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 CONFIG_SEMAPHORE_SLEEPERS=y
-# CONFIG_SENSORS_FSCHMD is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -382,7 +375,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 CONFIG_SLABINFO=y
-CONFIG_SMP=y
+# CONFIG_SMP is not set
 # CONFIG_SMSC37B787_WDT is not set
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_HDA_CODEC_ANALOG=y
@@ -405,7 +398,6 @@ CONFIG_SOFT_WATCHDOG=m
 CONFIG_SPARSEMEM_STATIC=y
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
 CONFIG_SSB_POSSIBLE=y
-CONFIG_STOP_MACHINE=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TCIC is not set
 # CONFIG_TELCLOCK is not set
@@ -445,7 +437,6 @@ CONFIG_VT_CONSOLE=y
 # CONFIG_WDT is not set
 CONFIG_X86=y
 CONFIG_X86_32=y
-CONFIG_X86_32_SMP=y
 # CONFIG_X86_64 is not set
 # CONFIG_X86_BIGSMP is not set
 CONFIG_X86_BIOS_REBOOT=y
@@ -460,7 +451,6 @@ CONFIG_X86_FIND_SMP_CONFIG=y
 CONFIG_X86_GENERIC=y
 # CONFIG_X86_GENERICARCH is not set
 CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_HT=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=7
@@ -482,13 +472,13 @@ CONFIG_X86_PC=y
 CONFIG_X86_PPRO_FENCE=y
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_X86_SMP=y
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SPEEDSTEP_ICH is not set
 # CONFIG_X86_SPEEDSTEP_LIB is not set
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 # CONFIG_X86_SUMMIT is not set
-CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set
 # CONFIG_X86_VSMP is not set