[SERIAL] Fix up various filenames, etc, from Ingo's merge of serial.

drivers/serial/21285.c

 /*
- * linux/drivers/char/serial_21285.c
+ * linux/drivers/char/21285.c
  *
  * Driver for the serial port on the 21285 StrongArm-110 core logic chip.
  *
  * Based on drivers/char/serial.c
  *
- *  $Id: serial_21285.c,v 1.32 2002/07/21 08:57:55 rmk Exp $
+ *  $Id: 21285.c,v 1.33 2002/07/21 21:32:29 rmk Exp $
  */
 #include <linux/config.h>
 #include <linux/module.h>
@@ -527,7 +527,7 @@ static int __init serial21285_init(void)
 {
 	int ret;
 
-	printk(KERN_INFO "Serial: 21285 driver $Revision: 1.32 $\n");
+	printk(KERN_INFO "Serial: 21285 driver $Revision: 1.33 $\n");
 
 	serial21285_setup_ports();
 
@@ -550,4 +550,4 @@ module_exit(serial21285_exit);
 EXPORT_NO_SYMBOLS;
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.32 $");
+MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.33 $");

drivers/serial/8250.c

 /*
- *  linux/drivers/char/serial_8250.c
+ *  linux/drivers/char/8250.c
  *
  *  Driver for 8250/16550-type serial ports
  *
@@ -12,7 +12,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *  $Id: serial_8250.c,v 1.80 2002/07/21 08:57:55 rmk Exp $
+ *  $Id: 8250.c,v 1.83 2002/07/21 23:08:22 rmk Exp $
  *
  * A note about mapbase / membase
  *
@@ -54,7 +54,7 @@
 #endif
 
 #include <linux/serial_core.h>
-#include "serial_8250.h"
+#include "8250.h"
 
 /*
  * Configuration:
@@ -1296,8 +1296,6 @@ serial8250_change_speed(struct uart_port *port, unsigned int cflag,
 	unsigned char cval, fcr = 0;
 	unsigned long flags;
 
-	printk("+++ change_speed port %p cflag %08x quot %d\n", port, cflag, quot);
-
 	switch (cflag & CSIZE) {
 	case CS5:
 		cval = 0x00;
@@ -1835,7 +1833,6 @@ static int __init serial8250_console_setup(struct console *co, char *options)
 	if (co->index >= UART_NR)
 		co->index = 0;
 	port = &serial8250_ports[co->index].port;
-	printk("+++ index %d port %p iobase %x\n", co->index, port, port->iobase);
 
 	/*
 	 * Temporary fix.
@@ -1844,7 +1841,6 @@ static int __init serial8250_console_setup(struct console *co, char *options)
 
 	if (options)
 		uart_parse_options(options, &baud, &parity, &bits, &flow);
-	printk("+++ baud %d bits %d parity %c flow %c\n", baud, parity, bits, flow);
 
 	return uart_set_options(port, co, baud, parity, bits, flow);
 }
@@ -1969,7 +1965,7 @@ static int __init serial8250_init(void)
 {
 	int ret, i;
 
-	printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.80 $ "
+	printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.83 $ "
 		"IRQ sharing %sabled\n", share_irqs ? "en" : "dis");
 
 	for (i = 0; i < NR_IRQS; i++)
@@ -2001,7 +1997,7 @@ EXPORT_SYMBOL(unregister_serial);
 EXPORT_SYMBOL(serial8250_get_irq_map);
 
 MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Generic 8250/16x50 serial driver $Revision: 1.80 $");
+MODULE_DESCRIPTION("Generic 8250/16x50 serial driver $Revision: 1.83 $");
 
 MODULE_PARM(share_irqs, "i");
 MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"

drivers/serial/8250.h

 /*
- *  linux/drivers/char/serial_8250.h
+ *  linux/drivers/char/8250.h
  *
  *  Driver for 8250/16550-type serial ports
  *
@@ -12,7 +12,7 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- *  $Id: serial_8250.h,v 1.7 2002/07/06 16:24:46 rmk Exp $
+ *  $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $
  */
 
 #include <linux/config.h>

drivers/serial/8250_pci.c

 /*
- *  linux/drivers/char/serial_8250_pci.c
+ *  linux/drivers/char/8250_pci.c
  *
  *  Probe module for 8250/16550-type PCI serial ports.
  *
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License.
  *
- *  $Id: serial_8250_pci.c,v 1.18 2002/03/10 22:32:08 rmk Exp $
+ *  $Id: 8250_pci.c,v 1.19 2002/07/21 21:32:30 rmk Exp $
  */
 #include <linux/module.h>
 #include <linux/init.h>
@@ -31,7 +31,7 @@
 #include <asm/byteorder.h>
 #include <asm/serial.h>
 
-#include "serial_8250.h"
+#include "8250.h"
 
 
 #ifndef IS_PCI_REGION_IOPORT

drivers/serial/8250_pnp.c

 /*
- *  linux/drivers/char/serial_8250_pnp.c
+ *  linux/drivers/char/8250_pnp.c
  *
  *  Probe module for 8250/16550-type ISAPNP serial ports.
  *
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License.
  *
- *  $Id: serial_8250_pnp.c,v 1.9 2002/02/18 19:20:29 rmk Exp $
+ *  $Id: 8250_pnp.c,v 1.10 2002/07/21 21:32:30 rmk Exp $
  */
 #include <linux/module.h>
 #include <linux/init.h>
@@ -26,7 +26,7 @@
 #include <asm/byteorder.h>
 #include <asm/serial.h>
 
-#include "serial_8250.h"
+#include "8250.h"
 
 struct pnpbios_device_id
 {

drivers/serial/Makefile

 #
 # Makefile for the kernel serial device drivers.
 #
-#  $Id: Makefile,v 1.7 2002/07/06 17:16:24 rmk Exp $
+#  $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $
 #
 
-export-objs	:= serial_core.o serial_8250.o
+export-objs	:= core.o 8250.o
 
 serial-8250-y :=
-serial-8250-$(CONFIG_PCI) += serial_8250_pci.o
-serial-8250-$(CONFIG_ISAPNP) += serial_8250_pnp.o
-obj-$(CONFIG_SERIAL_CORE) += serial_core.o
-obj-$(CONFIG_SERIAL_21285) += serial_21285.o
-obj-$(CONFIG_SERIAL_8250) += serial_8250.o $(serial-8250-y)
-obj-$(CONFIG_SERIAL_8250_CS) += serial_8250_cs.o
-obj-$(CONFIG_SERIAL_ANAKIN) += serial_anakin.o
-obj-$(CONFIG_SERIAL_AMBA) += serial_amba.o
-obj-$(CONFIG_SERIAL_CLPS711X) += serial_clps711x.o
-obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
-obj-$(CONFIG_SERIAL_UART00) += serial_uart00.o
+serial-8250-$(CONFIG_PCI) += 8250_pci.o
+serial-8250-$(CONFIG_ISAPNP) += 8250_pnp.o
+obj-$(CONFIG_SERIAL_CORE) += core.o
+obj-$(CONFIG_SERIAL_21285) += 21285.o
+obj-$(CONFIG_SERIAL_8250) += 8250.o $(serial-8250-y)
+obj-$(CONFIG_SERIAL_8250_CS) += 8250_cs.o
+obj-$(CONFIG_SERIAL_ANAKIN) += anakin.o
+obj-$(CONFIG_SERIAL_AMBA) += amba.o
+obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o
+obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
+obj-$(CONFIG_SERIAL_UART00) += uart00.o
 
 include $(TOPDIR)/Rules.make

drivers/serial/amba.c

 /*
- *  linux/drivers/char/serial_amba.c
+ *  linux/drivers/char/amba.c
  *
  *  Driver for AMBA serial ports
  *
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: serial_amba.c,v 1.35 2002/07/21 08:57:55 rmk Exp $
+ *  $Id: amba.c,v 1.36 2002/07/21 21:32:30 rmk Exp $
  *
  * This is a generic driver for ARM AMBA-type serial ports.  They
  * have a lot of 16550-like features, but are not register compatable.
@@ -751,7 +751,7 @@ static int __init ambauart_init(void)
 {
 	int ret;
 
-	printk(KERN_INFO "Serial: AMBA driver $Revision: 1.35 $\n");
+	printk(KERN_INFO "Serial: AMBA driver $Revision: 1.36 $\n");
 
 	ret = uart_register_driver(&amba_reg);
 	if (ret == 0) {
@@ -779,5 +779,5 @@ module_exit(ambauart_exit);
 EXPORT_NO_SYMBOLS;
 
 MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.35 $");
+MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.36 $");
 MODULE_LICENSE("GPL");

drivers/serial/anakin.c

 /*
- *  linux/drivers/char/serial_anakin.c
+ *  linux/drivers/char/anakin.c
  *
  *  Based on driver for AMBA serial ports, by ARM Limited,
  *  Deep Blue Solutions Ltd., Linus Torvalds and Theodore Ts'o.
@@ -19,7 +19,7 @@
  *   			SA_INTERRUPT. Works reliably now. No longer requires
  *   			changes to the serial_core API.
  *
- *  $Id: serial_anakin.c,v 1.27 2002/07/20 17:10:03 rmk Exp $
+ *  $Id: anakin.c,v 1.28 2002/07/21 21:32:30 rmk Exp $
  */
 
 #include <linux/config.h>
@@ -524,7 +524,7 @@ anakin_init(void)
 {
 	int ret;
 
-	printk(KERN_INFO "Serial: Anakin driver $Revision: 1.27 $\n");
+	printk(KERN_INFO "Serial: Anakin driver $Revision: 1.28 $\n");
 
 	ret = uart_register_driver(&anakin_reg);
 	if (ret == 0) {

drivers/serial/clps711x.c

 /*
- *  linux/drivers/char/serial_clps711x.c
+ *  linux/drivers/char/clps711x.c
  *
  *  Driver for CLPS711x serial ports
  *
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: serial_clps711x.c,v 1.38 2002/07/21 08:57:55 rmk Exp $
+ *  $Id: clps711x.c,v 1.39 2002/07/21 21:32:30 rmk Exp $
  *
  */
 #include <linux/config.h>
@@ -611,7 +611,7 @@ static int __init clps711xuart_init(void)
 {
 	int ret, i;
 
-	printk(KERN_INFO "Serial: CLPS711x driver $Revision: 1.38 $\n");
+	printk(KERN_INFO "Serial: CLPS711x driver $Revision: 1.39 $\n");
 
 	ret = uart_register_driver(&clps711x_reg);
 	if (ret)
@@ -639,5 +639,5 @@ module_exit(clps711xuart_exit);
 EXPORT_NO_SYMBOLS;
 
 MODULE_AUTHOR("Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.38 $");
+MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.39 $");
 MODULE_LICENSE("GPL");

drivers/serial/core.c

 /*
- *  linux/drivers/char/serial_core.c
+ *  linux/drivers/char/core.c
  *
  *  Driver core for serial ports
  *
@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: serial_core.c,v 1.89 2002/07/20 18:07:32 rmk Exp $
+ *  $Id: core.c,v 1.90 2002/07/21 21:32:30 rmk Exp $
  *
  */
 #include <linux/config.h>

drivers/serial/sa1100.c

 /*
- *  linux/drivers/char/serial_sa1100.c
+ *  linux/drivers/char/sa1100.c
  *
  *  Driver for SA11x0 serial ports
  *
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: serial_sa1100.c,v 1.41 2002/07/21 08:57:55 rmk Exp $
+ *  $Id: sa1100.c,v 1.42 2002/07/21 21:32:30 rmk Exp $
  *
  */
 #include <linux/config.h>
@@ -866,7 +866,7 @@ static int __init sa1100_serial_init(void)
 {
 	int ret;
 
-	printk(KERN_INFO "Serial: SA11x0 driver $Revision: 1.41 $\n");
+	printk(KERN_INFO "Serial: SA11x0 driver $Revision: 1.42 $\n");
 
 	sa1100_init_ports();
 	ret = uart_register_driver(&sa1100_reg);
@@ -895,5 +895,5 @@ module_exit(sa1100_serial_exit);
 EXPORT_NO_SYMBOLS;
 
 MODULE_AUTHOR("Deep Blue Solutions Ltd");
-MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.41 $");
+MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.42 $");
 MODULE_LICENSE("GPL");

drivers/serial/uart00.c

 /*
- *  linux/drivers/char/serial_uart00.c
+ *  linux/drivers/char/uart00.c
  *
  *  Driver for UART00 serial ports
  *
@@ -21,7 +21,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: serial_uart00.c,v 1.32 2002/07/20 17:10:04 rmk Exp $
+ *  $Id: uart00.c,v 1.33 2002/07/21 21:32:31 rmk Exp $
  *
  */
 #include <linux/config.h>
@@ -755,7 +755,7 @@ static int __init uart00_init(void)
 {
 	int result;
 
-	printk(KERN_INFO "Serial: UART00 driver $Revision: 1.32 $\n");
+	printk(KERN_INFO "Serial: UART00 driver $Revision: 1.33 $\n");
 
 	printk(KERN_WARNING "serial_uart00:Using temporary major/minor pairs"
 		" - these WILL change in the future\n");