diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 16:19:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 16:19:00 -0400 |
commit | b7c2f036284452627d793af981877817b37d4351 (patch) | |
tree | c96bbf7558512b27f4802994c9271ccd0f1c19f3 /drivers/tty/cyclades.c | |
parent | 14587a2a25447813996e6fb9e48d48627cb75a5d (diff) | |
parent | 8d2c50e3b65c8d48d51088f541c13fde46cc8133 (diff) |
Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
gfs2: Drop __TIME__ usage
isdn/diva: Drop __TIME__ usage
atm: Drop __TIME__ usage
dlm: Drop __TIME__ usage
wan/pc300: Drop __TIME__ usage
parport: Drop __TIME__ usage
hdlcdrv: Drop __TIME__ usage
baycom: Drop __TIME__ usage
pmcraid: Drop __DATE__ usage
edac: Drop __DATE__ usage
rio: Drop __DATE__ usage
scsi/wd33c93: Drop __TIME__ usage
scsi/in2000: Drop __TIME__ usage
aacraid: Drop __TIME__ usage
media/cx231xx: Drop __TIME__ usage
media/radio-maxiradio: Drop __TIME__ usage
nozomi: Drop __TIME__ usage
cyclades: Drop __TIME__ usage
Diffstat (limited to 'drivers/tty/cyclades.c')
-rw-r--r-- | drivers/tty/cyclades.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c index bfa05e801823..c0e8f2eeb886 100644 --- a/drivers/tty/cyclades.c +++ b/drivers/tty/cyclades.c | |||
@@ -4096,8 +4096,7 @@ static int __init cy_init(void) | |||
4096 | if (!cy_serial_driver) | 4096 | if (!cy_serial_driver) |
4097 | goto err; | 4097 | goto err; |
4098 | 4098 | ||
4099 | printk(KERN_INFO "Cyclades driver " CY_VERSION " (built %s %s)\n", | 4099 | printk(KERN_INFO "Cyclades driver " CY_VERSION "\n"); |
4100 | __DATE__, __TIME__); | ||
4101 | 4100 | ||
4102 | /* Initialize the tty_driver structure */ | 4101 | /* Initialize the tty_driver structure */ |
4103 | 4102 | ||