From: James S. <jsi...@tr...> - 2001-10-27 20:38:27
|
Be careful. This file in the OSS tree is really broken. I will send another patch to Ralph to fix this up. What we have in CVS is correct. The one in the OSS tree is broken. > Index: Config.in > =================================================================== > RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v > retrieving revision 1.15 > retrieving revision 1.16 > diff -u -d -r1.15 -r1.16 > --- Config.in 2001/10/26 17:36:56 1.15 > +++ Config.in 2001/10/27 17:28:54 1.16 > @@ -68,11 +68,6 @@ > fi > if [ "$CONFIG_MIPS_ITE8172" = "y" -o "$CONFIG_MIPS_IVR" = "y" ]; then > bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD > - if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then > - define_bool CONFIG_IT8172_CIR y > - else > - bool ' Enable PS2 Keyboard Support' CONFIG_PC_KEYB > - fi > bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0 > bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1 > fi > @@ -87,6 +82,24 @@ > fi > bool ' Console on DC21285 serial port' CONFIG_SERIAL_21285_CONSOLE > fi > + if [ "$CONFIG_MIPS" = "y" ]; then > + bool ' TMPTX3912/PR31700 serial port support' CONFIG_SERIAL_TX3912 > + dep_bool ' Console on TMPTX3912/PR31700 serial port' CONFIG_SERIAL_TX3912_CONSOLE $CONFIG_SERIAL_TX3912 > + bool ' Enable Au1000 UART Support' CONFIG_AU1000_UART > + if [ "$CONFIG_AU1000_UART" = "y" ]; then > + bool ' Enable Au1000 serial console' CONFIG_AU1000_SERIAL_CONSOLE > + fi > + fi > +fi > +if [ "$CONFIG_IT8712" = "y" ]; then > + bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD > + if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then > + define_bool CONFIG_IT8172_CIR y > + else > + bool ' Enable PS2 Keyboard Support' CONFIG_PC_KEYB > + fi > + bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0 > + bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1 > fi > bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS > if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then > > > _______________________________________________ > Linux-mips-commits mailing list > Lin...@li... > https://lists.sourceforge.net/lists/listinfo/linux-mips-commits > |