[Linuxconsole-commit]CVS: ruby/linux/drivers/char Config.in,1.26,1.27 Makefile,1.27,1.28

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv1198/drivers/char

Modified Files:
	Config.in Makefile 
Log Message:
Synced to 2.4.12

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Config.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Config.in	2001/10/06 16:11:13	1.26
+++ Config.in	2001/10/15 01:13:17	1.27
@@ -192,8 +192,8 @@
 
 dep_tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP
 if [ "$CONFIG_AGP" != "n" ]; then
-   bool '  Intel 440LX/BX/GX and I815/I840/I850 support' CONFIG_AGP_INTEL
-   bool '  Intel I810/I815 (on-board) support' CONFIG_AGP_I810
+   bool '  Intel 440LX/BX/GX and I815/I830M/I840/I850 support' CONFIG_AGP_INTEL
+   bool '  Intel I810/I815/I830M (on-board) support' CONFIG_AGP_I810
    bool '  VIA chipset support' CONFIG_AGP_VIA
    bool '  AMD Irongate, 761, and 762 support' CONFIG_AGP_AMD
    bool '  Generic SiS support' CONFIG_AGP_SIS

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile	2001/10/06 16:11:13	1.27
+++ Makefile	2001/10/15 01:13:17	1.28
@@ -22,7 +22,8 @@
 # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
 
 export-objs     :=	vt.o keyboard.o sysrq.o misc.o pty.o random.o \
-			selection.o serial.o sonypi.o tty_io.o tty_ioctl.o 
+			selection.o serial.o sonypi.o tty_io.o tty_ioctl.o \
+			generic_serial.o 
 
 mod-subdirs	:=	ftape drm pcmcia