avr32: upgrade to 2.6.25.6

[openwrt.git] / target / linux / ar7 / config-2.6.24

diff --git a/target/linux/ar7/config-2.6.24 b/target/linux/ar7/config-2.6.24
index e356ddc..23894fd 100644 (file)
--- a/target/linux/ar7/config-2.6.24
+++ b/target/linux/ar7/config-2.6.24
@@ -15,6 +15,7 @@ CONFIG_BITREVERSE=y
 CONFIG_BOOT_ELF32=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_BT is not set
 CONFIG_BOOT_ELF32=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_BT is not set

+CONFIG_CEVT_R4K=y

 CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
 CONFIG_CPMAC=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
 CONFIG_CPMAC=y
 # CONFIG_CPU_BIG_ENDIAN is not set


@@ -46,7 +47,7 @@ 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_HW is not set
+CONFIG_CSRC_R4K=y

 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y


@@ -151,7 +152,6 @@ CONFIG_PHYLIB=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

-# CONFIG_SCSI_SRP_ATTRS is not set

 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SGI_IP22 is not set
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SGI_IP22 is not set


@@ -166,7 +166,10 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set

+# CONFIG_SLAB is not set

 CONFIG_SLABINFO=y
 CONFIG_SLABINFO=y

+CONFIG_SLUB=y
+# CONFIG_SLUB_DEBUG is not set

 # CONFIG_SMSC_PHY is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set