git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
configs
/
bseip_defconfig
diff --git
a/arch/ppc/configs/bseip_defconfig
b/arch/ppc/configs/bseip_defconfig
index
4f84a24
..
ce9f9f7
100644
(file)
--- a/
arch/ppc/configs/bseip_defconfig
+++ b/
arch/ppc/configs/bseip_defconfig
@@
-193,7
+193,6
@@
CONFIG_IPV6_SCTP__=y
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_DIVERT is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
# CONFIG_NET_HW_FLOWCONTROL is not set
#
# CONFIG_NET_HW_FLOWCONTROL is not set
#
@@
-293,25
+292,26
@@
CONFIG_SOUND_GAMEPORT=y
# Macintosh device drivers
#
# Macintosh device drivers
#
-#
-# Character devices
-#
-# CONFIG_SERIAL_NONSTANDARD is not set
-
#
# Serial drivers
#
#
# 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
#
# 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_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# I2C support
#
# I2C support
@@
-477,10
+477,6
@@
CONFIG_SCC2_ENET=y
# CONFIG_SCC3_ENET is not set
# CONFIG_FEC_ENET is not set
# CONFIG_ENET_BIG_BUFFERS is not set
# CONFIG_SCC3_ENET is not set
# CONFIG_FEC_ENET is not set
# CONFIG_ENET_BIG_BUFFERS is not set
-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
#
# Generic MPC8xx Options