lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

Browse Source 
* '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
parent 14587a2a25 8d2c50e3b6
commit b7c2f03628
40 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/scsi/pmcraid.c
View File

@@ -4252,8 +4252,8 @@ static ssize_t pmcraid_show_drv_version(
char *buf
)
{
return snprintf(buf, PAGE_SIZE, "version: %s, build date: %s\n",
PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE);
return snprintf(buf, PAGE_SIZE, "version: %s\n",
PMCRAID_DRIVER_VERSION);
}
static struct device_attribute pmcraid_driver_version_attr = {
@@ -6096,9 +6096,8 @@ static int __init pmcraid_init(void)
dev_t dev;
int error;
pmcraid_info("%s Device Driver version: %s %s\n",
PMCRAID_DRIVER_NAME,
PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE);
pmcraid_info("%s Device Driver version: %s\n",
PMCRAID_DRIVER_NAME, PMCRAID_DRIVER_VERSION);
error = alloc_chrdev_region(&dev, 0,
PMCRAID_MAX_ADAPTERS,