[x86] merge the olpc target with the x86 target, both tested and running

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

diff --git a/target/linux/atheros/config-2.6.30 b/target/linux/atheros/config-2.6.30
index c5730b5..7c9b881 100644 (file)
--- a/target/linux/atheros/config-2.6.30
+++ b/target/linux/atheros/config-2.6.30
@@ -23,6 +23,7 @@ CONFIG_BITREVERSE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
 CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2"

+# CONFIG_COMPAT_NET_DEV_OPS is not set

 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_CAVIUM_OCTEON is not set
 CONFIG_CPU_HAS_LLSC=y


@@ -54,12 +55,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX 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_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y
 CONFIG_CSRC_R4K=y
 CONFIG_CSRC_R4K_LIB=y
 CONFIG_DECOMPRESS_LZMA=y


@@ -87,7 +82,6 @@ CONFIG_HAVE_OPROFILE=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 # CONFIG_I2C is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 # CONFIG_I2C is not set

-# CONFIG_IMAGE_CMDLINE_HACK is not set

 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IP175C_PHY=y
 CONFIG_IRQ_CPU=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IP175C_PHY=y
 CONFIG_IRQ_CPU=y