[Gc-linux-cvs] linux/arch/ppc/configs gamecube_defconfig,1.21,1.22

[<aot...@us...>]

Update of /cvsroot/gc-linux/linux/arch/ppc/configs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9216/arch/ppc/configs

Modified Files:
	gamecube_defconfig 
Log Message:
Merged 2.6.9

Index: gamecube_defconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/ppc/configs/gamecube_defconfig,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gamecube_defconfig	15 Aug 2004 22:33:03 -0000	1.21
+++ gamecube_defconfig	19 Oct 2004 09:46:08 -0000	1.22
@@ -1,5 +1,7 @@
 #
 # Automatically generated make config: don't edit
+# Linux kernel version: 2.6.9
+# Tue Oct 19 05:43:13 2004
 #
 CONFIG_MMU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -18,6 +20,7 @@
 #
 # General setup
 #
+CONFIG_LOCALVERSION=""
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -37,6 +40,8 @@
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+# CONFIG_TINY_SHMEM is not set
 
 #
 # Loadable module support
@@ -99,7 +104,6 @@
 # CONFIG_GAMECUBE_CONSOLE is not set
 # CONFIG_PREEMPT is not set
 # CONFIG_HIGHMEM is not set
-CONFIG_KERNEL_ELF=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_CMDLINE_BOOL=y
@@ -221,6 +225,7 @@
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
 # CONFIG_IPV6 is not set
 # CONFIG_NETFILTER is not set
 
@@ -333,6 +338,7 @@
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_SERPORT is not set
 # CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_RAW is not set
 
 #
 # Input Device Drivers
@@ -367,7 +373,6 @@
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_QIC02_TAPE is not set
 
 #
 # IPMI
@@ -419,6 +424,7 @@
 # Graphics support
 #
 CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_CT65550 is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_GAMECUBE=y
@@ -428,7 +434,6 @@
 # Console display driver support
 #
 # CONFIG_VGA_CONSOLE is not set
-# CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FONTS is not set