refresh 2.6.32 patches with -rc7

[openwrt.git] / target / linux / mpc83xx / config-default

diff --git a/target/linux/mpc83xx/config-default b/target/linux/mpc83xx/config-default
index c37f3a6..b1cf4fe 100644 (file)
--- a/target/linux/mpc83xx/config-default
+++ b/target/linux/mpc83xx/config-default
@@ -20,12 +20,8 @@ CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASP834x is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 # CONFIG_ASP834x is not set

-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y

 CONFIG_ATA=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ATA=y
 CONFIG_AUDIT_ARCH=y

-CONFIG_BASE_SMALL=0

 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BOOTX_TEXT is not set
 # CONFIG_BINARY_PRINTF is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BOOTX_TEXT is not set


@@ -34,14 +30,12 @@ CONFIG_BOUNCE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,115200"
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyS0,115200"

-# CONFIG_CPU_FREQ is not set

 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_WORKQUEUE=y

-# CONFIG_DEBUG_BUGVERBOSE is not set

 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEVPORT=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_DEFAULT_UIMAGE=y
 CONFIG_DEVPORT=y


@@ -98,7 +92,6 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ=250
 CONFIG_HZ_250=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ=250
 CONFIG_HZ_250=y

-# CONFIG_I2C is not set

 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IPIC=y
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IOMMU_HELPER is not set
 CONFIG_IPIC=y


@@ -132,20 +125,15 @@ CONFIG_MPIC=y
 CONFIG_MTD_NAND_RB_PPC=y
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_OF_PARTS is not set
 CONFIG_MTD_NAND_RB_PPC=y
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_OF_PARTS is not set

-# CONFIG_NATSEMI is not set
-# CONFIG_NVRAM is not set

 CONFIG_OF_DEVICE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_RB_PPC=m
 CONFIG_OF_DEVICE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_PATA_RB_PPC=m

-# CONFIG_PATA_SCH is not set

 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCIEPORTBUS is not set

-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y

 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000


@@ -212,11 +200,9 @@ CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_QE is not set
 # CONFIG_SIMPLE_GPIO is not set
 # CONFIG_SLOW_WORK is not set
 # CONFIG_SERIAL_QE is not set
 # CONFIG_SIMPLE_GPIO is not set
 # CONFIG_SLOW_WORK is not set

-# CONFIG_SMP is not set

 # CONFIG_SQUASHFS is not set
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set
 # CONFIG_SQUASHFS is not set
 CONFIG_TASK_SIZE=0xc0000000
 # CONFIG_TAU is not set

-CONFIG_TICK_ONESHOT=y

 CONFIG_TRACING_SUPPORT=y
 # CONFIG_UCC_GETH is not set
 # CONFIG_UDBG_RTAS_CONSOLE is not set
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_UCC_GETH is not set
 # CONFIG_UDBG_RTAS_CONSOLE is not set