temporary remove the pfifo fast patch from 2.6.32, too

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

diff --git a/target/linux/x86/config-2.6.30 b/target/linux/x86/config-2.6.30
index d03908c..6cc2685 100644 (file)
--- a/target/linux/x86/config-2.6.30
+++ b/target/linux/x86/config-2.6.30
@@ -26,28 +26,17 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_AT1700 is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_AT1700 is not set

+CONFIG_ATA=y
+CONFIG_ATA_GENERIC=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_PIIX=y
+CONFIG_ATA_SFF=y

 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BINFMT_MISC=y
 CONFIG_BITREVERSE=y

-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-CONFIG_BLK_DEV_AMD74XX=y
-# CONFIG_BLK_DEV_CS5536 is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_HT6560B is not set
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_IT8172 is not set
-CONFIG_BLK_DEV_PIIX=y
-# CONFIG_BLK_DEV_QD65XX is not set
-CONFIG_BLK_DEV_SC1200=y
-# CONFIG_BLK_DEV_UMC8672 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
+CONFIG_BLK_DEV_SD=y

 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_BOUNCE=y
 # CONFIG_CC_STACKPROTECTOR is not set


@@ -77,10 +66,6 @@ CONFIG_CPU_SUP_CYRIX_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y
 CONFIG_CPU_SUP_INTEL=y
 CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_CPU_SUP_UMC_32=y

-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_CRC32C_INTEL is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set

 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set
 # CONFIG_CS5535_GPIO is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DCDBAS is not set


@@ -90,8 +75,6 @@ CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_IO_DELAY_TYPE=0

-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set

 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y
 # CONFIG_DELL_RBU is not set
 # CONFIG_DEPCA is not set
 CONFIG_DEVPORT=y


@@ -120,7 +103,6 @@ CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FRAME_POINTER is not set

-# CONFIG_FREEZER is not set

 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 # CONFIG_FTRACE_SYSCALLS is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y


@@ -190,15 +172,6 @@ CONFIG_HW_RANDOM_VIA=y
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_IB700_WDT is not set
 # CONFIG_IBMASR is not set
 # CONFIG_IBM_ASM is not set

-CONFIG_IDE=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-CONFIG_IDE_GD=y
-CONFIG_IDE_GD_ATA=y
-# CONFIG_IDE_GD_ATAPI is not set
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_PROC_FS is not set
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_XFER_MODE=y

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y


@@ -227,8 +200,8 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_ITCO_WDT is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KERNEL_BZIP2 is not set

-# CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_LZMA=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_LZMA is not set

 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEXEC=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set


@@ -240,17 +213,12 @@ CONFIG_KTIME_SCALAR=y
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LANCE is not set
 # CONFIG_LEDS_ALIX2 is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set

-# CONFIG_LIB80211 is not set

 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 CONFIG_M386=y
 # CONFIG_M486 is not set
 # CONFIG_M586 is not set
 # CONFIG_M586MMX is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set

-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_MINSTREL=y

 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MATH_EMULATION=y
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MATH_EMULATION=y


@@ -304,8 +272,6 @@ CONFIG_NAMESPACES=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set

-# CONFIG_NF_DEFRAG_IPV4 is not set
-CONFIG_NLATTR=y

 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NR_CPUS=1
 # CONFIG_NSC_GPIO is not set


@@ -315,6 +281,12 @@ CONFIG_NVRAM=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT_GUEST is not set

+CONFIG_PATA_AMD=y
+# CONFIG_PATA_CS5536 is not set
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_VIA=y

 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y


@@ -327,12 +299,10 @@ CONFIG_PCI_GOANY=y
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set
 # CONFIG_PCI_GODIRECT is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GOOLPC is not set

-# CONFIG_PCI_STUB is not set

 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
 CONFIG_PCSPKR_PLATFORM=y
 # CONFIG_PCWATCHDOG is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000

-# CONFIG_PHYS_ADDR_T_64BIT is not set

 CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set


@@ -352,7 +322,8 @@ CONFIG_RTC=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 # CONFIG_SC520_WDT is not set
 # CONFIG_SCHED_HRTICK is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y

-# CONFIG_SCSI_DMA is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_LOWLEVEL is not set

 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 # CONFIG_SCx200_GPIO is not set
 CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 # CONFIG_SCx200_GPIO is not set