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/wd33c93.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/wd33c93.c')
-rw-r--r-- | drivers/scsi/wd33c93.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c index 97ae716134d0..c0ee4ea28a19 100644 --- a/drivers/scsi/wd33c93.c +++ b/drivers/scsi/wd33c93.c | |||
@@ -2051,8 +2051,7 @@ wd33c93_init(struct Scsi_Host *instance, const wd33c93_regs regs, | |||
2051 | for (i = 0; i < MAX_SETUP_ARGS; i++) | 2051 | for (i = 0; i < MAX_SETUP_ARGS; i++) |
2052 | printk("%s,", setup_args[i]); | 2052 | printk("%s,", setup_args[i]); |
2053 | printk("\n"); | 2053 | printk("\n"); |
2054 | printk(" Version %s - %s, Compiled %s at %s\n", | 2054 | printk(" Version %s - %s\n", WD33C93_VERSION, WD33C93_DATE); |
2055 | WD33C93_VERSION, WD33C93_DATE, __DATE__, __TIME__); | ||
2056 | } | 2055 | } |
2057 | 2056 | ||
2058 | int | 2057 | int |
@@ -2132,8 +2131,8 @@ wd33c93_proc_info(struct Scsi_Host *instance, char *buf, char **start, off_t off | |||
2132 | bp = buf; | 2131 | bp = buf; |
2133 | *bp = '\0'; | 2132 | *bp = '\0'; |
2134 | if (hd->proc & PR_VERSION) { | 2133 | if (hd->proc & PR_VERSION) { |
2135 | sprintf(tbuf, "\nVersion %s - %s. Compiled %s %s", | 2134 | sprintf(tbuf, "\nVersion %s - %s.", |
2136 | WD33C93_VERSION, WD33C93_DATE, __DATE__, __TIME__); | 2135 | WD33C93_VERSION, WD33C93_DATE); |
2137 | strcat(bp, tbuf); | 2136 | strcat(bp, tbuf); |
2138 | } | 2137 | } |
2139 | if (hd->proc & PR_INFO) { | 2138 | if (hd->proc & PR_INFO) { |