Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102352
b: refs/heads/master
c: d87a6d9
h: refs/heads/master
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jul 21, 2008
1 parent 224ede8 commit c2c954a
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 41 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 59247ca2fdca9691a6a7df532a830e3a133d9962
refs/heads/master: d87a6d951c6c09d191d9c10903deb3cc353fcd2c
6 changes: 2 additions & 4 deletions trunk/drivers/serial/21285.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
* Driver for the serial port on the 21285 StrongArm-110 core logic chip.
*
* Based on drivers/char/serial.c
*
* $Id: 21285.c,v 1.37 2002/07/28 10:03:27 rmk Exp $
*/
#include <linux/module.h>
#include <linux/tty.h>
Expand Down Expand Up @@ -494,7 +492,7 @@ static int __init serial21285_init(void)
{
int ret;

printk(KERN_INFO "Serial: 21285 driver $Revision: 1.37 $\n");
printk(KERN_INFO "Serial: 21285 driver\n");

serial21285_setup_ports();

Expand All @@ -515,5 +513,5 @@ module_init(serial21285_init);
module_exit(serial21285_exit);

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver $Revision: 1.37 $");
MODULE_DESCRIPTION("Intel Footbridge (21285) serial driver");
MODULE_ALIAS_CHARDEV(SERIAL_21285_MAJOR, SERIAL_21285_MINOR);
6 changes: 2 additions & 4 deletions trunk/drivers/serial/8250.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* $Id: 8250.c,v 1.90 2002/07/28 10:03:27 rmk Exp $
*
* A note about mapbase / membase
*
* mapbase is the physical address of the IO port.
Expand Down Expand Up @@ -2934,7 +2932,7 @@ static int __init serial8250_init(void)
if (nr_uarts > UART_NR)
nr_uarts = UART_NR;

printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ "
printk(KERN_INFO "Serial: 8250/16550 driver"
"%d ports, IRQ sharing %sabled\n", nr_uarts,
share_irqs ? "en" : "dis");

Expand Down Expand Up @@ -2995,7 +2993,7 @@ EXPORT_SYMBOL(serial8250_suspend_port);
EXPORT_SYMBOL(serial8250_resume_port);

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Generic 8250/16x50 serial driver $Revision: 1.90 $");
MODULE_DESCRIPTION("Generic 8250/16x50 serial driver");

module_param(share_irqs, uint, 0644);
MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/serial/8250.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* $Id: 8250.h,v 1.8 2002/07/21 21:32:30 rmk Exp $
*/

#include <linux/serial_8250.h>
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/serial/8250_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License.
*
* $Id: 8250_pci.c,v 1.28 2002/11/02 11:14:18 rmk Exp $
*/
#include <linux/module.h>
#include <linux/init.h>
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/serial/8250_pnp.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License.
*
* $Id: 8250_pnp.c,v 1.10 2002/07/21 21:32:30 rmk Exp $
*/
#include <linux/module.h>
#include <linux/init.h>
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/serial/Kconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#
# Serial device configuration
#
# $Id: Kconfig,v 1.11 2004/03/11 18:08:04 lethal Exp $
#

menu "Serial drivers"
depends on HAS_IOMEM
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/serial/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#
# Makefile for the kernel serial device drivers.
#
# $Id: Makefile,v 1.8 2002/07/21 21:32:30 rmk Exp $
#

obj-$(CONFIG_SERIAL_CORE) += serial_core.o
obj-$(CONFIG_SERIAL_21285) += 21285.o
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/serial/amba-pl010.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* $Id: amba.c,v 1.41 2002/07/28 10:03:27 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 compatible.
* Note that although they do have CTS, DCD and DSR inputs, they do
Expand Down Expand Up @@ -791,7 +789,7 @@ static int __init pl010_init(void)
{
int ret;

printk(KERN_INFO "Serial: AMBA driver $Revision: 1.41 $\n");
printk(KERN_INFO "Serial: AMBA driver\n");

ret = uart_register_driver(&amba_reg);
if (ret == 0) {
Expand All @@ -812,5 +810,5 @@ module_init(pl010_init);
module_exit(pl010_exit);

MODULE_AUTHOR("ARM Ltd/Deep Blue Solutions Ltd");
MODULE_DESCRIPTION("ARM AMBA serial port driver $Revision: 1.41 $");
MODULE_DESCRIPTION("ARM AMBA serial port driver");
MODULE_LICENSE("GPL");
2 changes: 0 additions & 2 deletions trunk/drivers/serial/amba-pl011.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* $Id: amba.c,v 1.41 2002/07/28 10:03:27 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 compatible.
* Note that although they do have CTS, DCD and DSR inputs, they do
Expand Down
7 changes: 2 additions & 5 deletions trunk/drivers/serial/clps711x.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* $Id: clps711x.c,v 1.42 2002/07/28 10:03:28 rmk Exp $
*
*/

#if defined(CONFIG_SERIAL_CLPS711X_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
Expand Down Expand Up @@ -551,7 +548,7 @@ static int __init clps711xuart_init(void)
{
int ret, i;

printk(KERN_INFO "Serial: CLPS711x driver $Revision: 1.42 $\n");
printk(KERN_INFO "Serial: CLPS711x driver\n");

ret = uart_register_driver(&clps711x_reg);
if (ret)
Expand All @@ -577,6 +574,6 @@ module_init(clps711xuart_init);
module_exit(clps711xuart_exit);

MODULE_AUTHOR("Deep Blue Solutions Ltd");
MODULE_DESCRIPTION("CLPS-711x generic serial driver $Revision: 1.42 $");
MODULE_DESCRIPTION("CLPS-711x generic serial driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS_CHARDEV(SERIAL_CLPS711X_MAJOR, SERIAL_CLPS711X_MINOR);
4 changes: 2 additions & 2 deletions trunk/drivers/serial/m32r_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ static int __init m32r_sio_init(void)
{
int ret, i;

printk(KERN_INFO "Serial: M32R SIO driver $Revision: 1.11 $ ");
printk(KERN_INFO "Serial: M32R SIO driver\n");

for (i = 0; i < NR_IRQS; i++)
spin_lock_init(&irq_lists[i].lock);
Expand Down Expand Up @@ -1189,4 +1189,4 @@ EXPORT_SYMBOL(m32r_sio_suspend_port);
EXPORT_SYMBOL(m32r_sio_resume_port);

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Generic M32R SIO serial driver $Revision: 1.11 $");
MODULE_DESCRIPTION("Generic M32R SIO serial driver");
4 changes: 2 additions & 2 deletions trunk/drivers/serial/mpsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1972,7 +1972,7 @@ static int __init mpsc_drv_init(void)
{
int rc;

printk(KERN_INFO "Serial: MPSC driver $Revision: 1.00 $\n");
printk(KERN_INFO "Serial: MPSC driver\n");

memset(mpsc_ports, 0, sizeof(mpsc_ports));
memset(&mpsc_shared_regs, 0, sizeof(mpsc_shared_regs));
Expand Down Expand Up @@ -2004,7 +2004,7 @@ module_init(mpsc_drv_init);
module_exit(mpsc_drv_exit);

MODULE_AUTHOR("Mark A. Greer <mgreer@mvista.com>");
MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver $Revision: 1.00 $");
MODULE_DESCRIPTION("Generic Marvell MPSC serial/UART driver");
MODULE_VERSION(MPSC_VERSION);
MODULE_LICENSE("GPL");
MODULE_ALIAS_CHARDEV_MAJOR(MPSC_MAJOR);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/serial/pnx8xxx_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ static int __init pnx8xxx_serial_init(void)
{
int ret;

printk(KERN_INFO "Serial: PNX8XXX driver $Revision: 1.2 $\n");
printk(KERN_INFO "Serial: PNX8XXX driver\n");

pnx8xxx_init_ports();

Expand Down
7 changes: 2 additions & 5 deletions trunk/drivers/serial/sa1100.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* $Id: sa1100.c,v 1.50 2002/07/29 14:41:04 rmk Exp $
*
*/

#if defined(CONFIG_SERIAL_SA1100_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
Expand Down Expand Up @@ -892,7 +889,7 @@ static int __init sa1100_serial_init(void)
{
int ret;

printk(KERN_INFO "Serial: SA11x0 driver $Revision: 1.50 $\n");
printk(KERN_INFO "Serial: SA11x0 driver\n");

sa1100_init_ports();

Expand All @@ -915,7 +912,7 @@ module_init(sa1100_serial_init);
module_exit(sa1100_serial_exit);

MODULE_AUTHOR("Deep Blue Solutions Ltd");
MODULE_DESCRIPTION("SA1100 generic serial port driver $Revision: 1.50 $");
MODULE_DESCRIPTION("SA1100 generic serial port driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_SA1100_MAJOR);
MODULE_ALIAS("platform:sa11x0-uart");
2 changes: 1 addition & 1 deletion trunk/drivers/serial/sunsu.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $Id: su.c,v 1.55 2002/01/08 16:00:16 davem Exp $
/*
* su.c: Small serial driver for keyboard/mouse interface on sparc32/PCI
*
* Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be)
Expand Down

0 comments on commit c2c954a

Please sign in to comment.