[Linux-mips-commits]CVS: linux/drivers/char Config.in,1.20,1.21 Makefile,1.16,1.17 misc.c,1.4,1.5 serial.c,1.6,1.7

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/char

Modified Files:
	Config.in Makefile misc.c serial.c 
Log Message:
Sync with OSS 2.4.14.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Config.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Config.in	2001/11/06 02:57:37	1.20
+++ Config.in	2001/11/06 09:10:21	1.21
@@ -202,7 +202,7 @@
 tristate 'Double Talk PC internal speech card support' CONFIG_DTLK
 tristate 'Siemens R3964 line discipline' CONFIG_R3964
 tristate 'Applicom intelligent fieldbus card support' CONFIG_APPLICOM
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+if [ "$CONFIG_EXPERIMENTAL" = "y" -a "$CONFIG_X86" = "y" ]; then
    dep_tristate 'Sony Vaio Programmable I/O Control Device support' CONFIG_SONYPI $CONFIG_PCI
 fi
 
@@ -213,7 +213,9 @@
    source drivers/char/ftape/Config.in
 fi
 
-tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
+if [ "$CONFIG_X86" = "y" ]; then
+   tristate 'ACP Modem (Mwave) support' CONFIG_MWAVE
+fi
 
 endmenu
 

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	2001/11/06 02:57:37	1.16
+++ Makefile	2001/11/06 09:10:21	1.17
@@ -199,6 +199,7 @@
   obj-$(CONFIG_NVRAM) += nvram.o
 endif
 obj-$(CONFIG_TOSHIBA) += toshiba.o
+obj-$(CONFIG_I8K) += i8k.o
 obj-$(CONFIG_DS1620) += ds1620.o
 obj-$(CONFIG_INTEL_RNG) += i810_rng.o
 obj-$(CONFIG_ITE_GPIO) += ite_gpio.o

Index: misc.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/misc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- misc.c	2001/08/10 18:28:58	1.4
+++ misc.c	2001/11/06 09:10:21	1.5
@@ -75,6 +75,7 @@
 extern int ds1286_init(void);
 extern int pmu_device_init(void);
 extern int tosh_init(void);
+extern int i8k_init(void);
 
 static int misc_read_proc(char *buf, char **start, off_t offset,
 			  int len, int *eof, void *private)
@@ -275,6 +276,9 @@
 #endif
 #ifdef CONFIG_TOSHIBA
 	tosh_init();
+#endif
+#ifdef CONFIG_I8K
+	i8k_init();
 #endif
 #ifdef CONFIG_COBALT_LCD
         lcd_init();

Index: serial.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/serial.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serial.c	2001/10/19 21:19:38	1.6
+++ serial.c	2001/11/06 09:10:21	1.7
@@ -4482,7 +4482,7 @@
 	else if (serial_pci_guess_board(dev, &tmp) == 0) {
 		printk(KERN_INFO "Redundant entry in serial pci_table.  "
 		       "Please send the output of\n"
-		       "lspci -vv, this message (%d,%d,%d,%d)\n"
+		       "lspci -vv, this message (%04x,%04x,%04x,%04x)\n"
 		       "and the manufacturer and name of "
 		       "serial board or modem board\n"
 		       "to ser...@li....\n",