[kernel] generic-2.6/2.6.28: show machine name in /proc/cpuinfo if CONFIG_MIPS_MACHIN...

[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 480a024..23894fd 100644 (file)
--- a/target/linux/ar7/config-2.6.24
+++ b/target/linux/ar7/config-2.6.24
@@ -17,6 +17,7 @@ CONFIG_BOOT_ELF32=y
 # CONFIG_BT is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
 # 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_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y


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

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


@@ -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