This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / configs / SM850_defconfig

diff --git a/arch/ppc/configs/SM850_defconfig b/arch/ppc/configs/SM850_defconfig
index 021884b..9553f56 100644 (file)
--- a/arch/ppc/configs/SM850_defconfig
+++ b/arch/ppc/configs/SM850_defconfig
@@ -92,8 +92,7 @@ CONFIG_KERNEL_ELF=y
 # Parallel port support
 #
 # CONFIG_PARPORT is not set
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyCPM1"
+# CONFIG_CMDLINE_BOOL is not set
 
 #
 # Advanced setup
@@ -297,27 +296,25 @@ CONFIG_SOUND_GAMEPORT=y
 # Macintosh device drivers
 #
 
+#
+# Character devices
+#
+# CONFIG_SERIAL_NONSTANDARD is not set
+
 #
 # Serial drivers
 #
-# CONFIG_SERIAL_8250 is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
 # Non-8250 serial port support
 #
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_CPM=y
-CONFIG_SERIAL_CPM_CONSOLE=y
-# CONFIG_SERIAL_CPM_SCC1 is not set
-# CONFIG_SERIAL_CPM_SCC2 is not set
-# CONFIG_SERIAL_CPM_SCC3 is not set
-# CONFIG_SERIAL_CPM_SCC4 is not set
-CONFIG_SERIAL_CPM_SMC1=y
-CONFIG_SERIAL_CPM_SMC2=y
-CONFIG_SERIAL_CPM_ALT_SMC2=y
 CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
+CONFIG_UNIX98_PTY_COUNT=32
 
 #
 # I2C support
@@ -482,6 +479,10 @@ CONFIG_SCC_ENET=y
 CONFIG_SCC3_ENET=y
 # CONFIG_FEC_ENET is not set
 CONFIG_ENET_BIG_BUFFERS=y
+CONFIG_SMC2_UART=y
+CONFIG_ALTSMC2=y
+CONFIG_CONS_SMC2=y
+# CONFIG_USE_SCC_IO is not set
 
 #
 # Generic MPC8xx Options