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/scsi/pmcraid.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/scsi/pmcraid.c')
-rw-r--r-- | drivers/scsi/pmcraid.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 7f636b118287..fca6a8953070 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
@@ -4252,8 +4252,8 @@ static ssize_t pmcraid_show_drv_version( | |||
4252 | char *buf | 4252 | char *buf |
4253 | ) | 4253 | ) |
4254 | { | 4254 | { |
4255 | return snprintf(buf, PAGE_SIZE, "version: %s, build date: %s\n", | 4255 | return snprintf(buf, PAGE_SIZE, "version: %s\n", |
4256 | PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE); | 4256 | PMCRAID_DRIVER_VERSION); |
4257 | } | 4257 | } |
4258 | 4258 | ||
4259 | static struct device_attribute pmcraid_driver_version_attr = { | 4259 | static struct device_attribute pmcraid_driver_version_attr = { |
@@ -6096,9 +6096,8 @@ static int __init pmcraid_init(void) | |||
6096 | dev_t dev; | 6096 | dev_t dev; |
6097 | int error; | 6097 | int error; |
6098 | 6098 | ||
6099 | pmcraid_info("%s Device Driver version: %s %s\n", | 6099 | pmcraid_info("%s Device Driver version: %s\n", |
6100 | PMCRAID_DRIVER_NAME, | 6100 | PMCRAID_DRIVER_NAME, PMCRAID_DRIVER_VERSION); |
6101 | PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE); | ||
6102 | 6101 | ||
6103 | error = alloc_chrdev_region(&dev, 0, | 6102 | error = alloc_chrdev_region(&dev, 0, |
6104 | PMCRAID_MAX_ADAPTERS, | 6103 | PMCRAID_MAX_ADAPTERS, |