From: James S. <jsi...@us...> - 2002-06-22 17:51:01
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/ppc Modified Files: config.in Log Message: Synced to 2.5.24 Index: config.in =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/config.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- config.in 3 Jun 2002 22:44:56 -0000 1.33 +++ config.in 22 Jun 2002 17:50:58 -0000 1.34 @@ -244,7 +244,7 @@ fi bool 'Blue Logic DMA' CONFIG_405_DMA - dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL + dep_bool 'Power Management support (EXPERIMENTAL)' CONFIG_PM $CONFIG_EXPERIMENTAL choice 'TTYS0 device and default console' \ "UART0 CONFIG_UART0_TTYS0 \ @@ -311,7 +311,7 @@ define_bool CONFIG_MCA n if [ "$CONFIG_4xx" = "y" -o "$CONFIG_8260" = "y" ]; then - bool "Enable PCI" CONFIG_PCI + bool "PCI support" CONFIG_PCI bool 'PC PS/2 style Keyboard' CONFIG_PC_KEYBOARD else if [ "$CONFIG_8xx" = "y" ]; then |