dslinux/vendors/Nintendo/GBAMP-EXT2 config.linux-2.6.x

[pepsiman]

Update of /cvsroot/dslinux/dslinux/vendors/Nintendo/GBAMP-EXT2
In directory antilope:/tmp/cvs-serv638/GBAMP-EXT2

Modified Files:
	config.linux-2.6.x 
Log Message:
Regenerate

Index: config.linux-2.6.x
===================================================================
RCS file: /cvsroot/dslinux/dslinux/vendors/Nintendo/GBAMP-EXT2/config.linux-2.6.x,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- config.linux-2.6.x	6 Aug 2006 13:11:04 -0000	1.14
+++ config.linux-2.6.x	23 Aug 2006 13:24:38 -0000	1.15
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.14-hsc0
-# Sat Mar 11 16:52:57 2006
+# Wed Aug 23 11:13:35 2006
 #
 CONFIG_ARM=y
 # CONFIG_MMU is not set
@@ -44,7 +44,9 @@
 CONFIG_CC_ALIGN_LABELS=0
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_SLAB is not set
 CONFIG_BASE_SMALL=1
+CONFIG_SLOB=y
 
 #
 # Loadable module support
@@ -107,7 +109,6 @@
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_CACHE_V4WB=y
-CONFIG_CPU_ARM946_CPU_IDLE=y
 
 #
 # Processor Features
@@ -115,6 +116,7 @@
 # CONFIG_ARM_THUMB is not set
 CONFIG_CPU_MXU_ENABLE=y
 CONFIG_TLS_REG_EMUL=y
+CONFIG_CPU_ARM946_CPU_IDLE=y
 
 #
 # Bus support
@@ -141,8 +143,6 @@
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_SLAB is not set
-CONFIG_SLOB=y
 
 #
 # Boot options