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
This commit is contained in:
Linus Torvalds
2011-05-26 13:19:00 -07:00
40 changed files with 44 additions and 54 deletions
+1 -2
View File
@@ -4096,8 +4096,7 @@ static int __init cy_init(void)
if (!cy_serial_driver)
goto err;
printk(KERN_INFO "Cyclades driver " CY_VERSION " (built %s %s)\n",
__DATE__, __TIME__);
printk(KERN_INFO "Cyclades driver " CY_VERSION "\n");
/* Initialize the tty_driver structure */
+1 -2
View File
@@ -61,8 +61,7 @@
#include <linux/delay.h>
#define VERSION_STRING DRIVER_DESC " 2.1d (build date: " \
__DATE__ " " __TIME__ ")"
#define VERSION_STRING DRIVER_DESC " 2.1d"
/* Macros definitions */