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/isdn | |
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/isdn')
-rw-r--r-- | drivers/isdn/hardware/eicon/divasfunc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/isdn/hardware/eicon/divasfunc.c b/drivers/isdn/hardware/eicon/divasfunc.c index d36a4c09e25d..0bbee7824d78 100644 --- a/drivers/isdn/hardware/eicon/divasfunc.c +++ b/drivers/isdn/hardware/eicon/divasfunc.c | |||
@@ -113,9 +113,8 @@ void diva_xdi_didd_remove_adapter(int card) | |||
113 | static void start_dbg(void) | 113 | static void start_dbg(void) |
114 | { | 114 | { |
115 | DbgRegister("DIVAS", DRIVERRELEASE_DIVAS, (debugmask) ? debugmask : DBG_DEFAULT); | 115 | DbgRegister("DIVAS", DRIVERRELEASE_DIVAS, (debugmask) ? debugmask : DBG_DEFAULT); |
116 | DBG_LOG(("DIVA ISDNXDI BUILD (%s[%s]-%s-%s)", | 116 | DBG_LOG(("DIVA ISDNXDI BUILD (%s[%s])", |
117 | DIVA_BUILD, diva_xdi_common_code_build, __DATE__, | 117 | DIVA_BUILD, diva_xdi_common_code_build)) |
118 | __TIME__)) | ||
119 | } | 118 | } |
120 | 119 | ||
121 | /* | 120 | /* |