X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fppc%2Fconfigs%2FTQM860L_defconfig;h=857e4ab28011d38595ca4971c5910f6f493c8a27;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=469fcb48b2a673c652bbbafc85dc41e571e6ff82;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/arch/ppc/configs/TQM860L_defconfig b/arch/ppc/configs/TQM860L_defconfig
index 469fcb48b..857e4ab28 100644
--- a/arch/ppc/configs/TQM860L_defconfig
+++ b/arch/ppc/configs/TQM860L_defconfig
@@ -320,25 +320,26 @@ CONFIG_SOUND_GAMEPORT=y
 # Macintosh device drivers
 #
 
-#
-# Character devices
-#
-# CONFIG_SERIAL_NONSTANDARD is not set
-
 #
 # Serial drivers
 #
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
+# CONFIG_SERIAL_8250 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_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=32
+# CONFIG_LEGACY_PTYS is not set
 
 #
 # I2C support
@@ -508,10 +509,6 @@ CONFIG_SCC1_ENET=y
 # CONFIG_SCC3_ENET is not set
 # CONFIG_FEC_ENET is not set
 CONFIG_ENET_BIG_BUFFERS=y
-CONFIG_SMC2_UART=y
-# CONFIG_ALTSMC2 is not set
-# CONFIG_CONS_SMC2 is not set
-# CONFIG_USE_SCC_IO is not set
 
 #
 # Generic MPC8xx Options