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 | |
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
40 files changed, 44 insertions, 54 deletions
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c index cace0a7b707a..e47e73bbbcc5 100644 --- a/drivers/edac/amd76x_edac.c +++ b/drivers/edac/amd76x_edac.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <linux/edac.h> | 19 | #include <linux/edac.h> |
20 | #include "edac_core.h" | 20 | #include "edac_core.h" |
21 | 21 | ||
22 | #define AMD76X_REVISION " Ver: 2.0.2 " __DATE__ | 22 | #define AMD76X_REVISION " Ver: 2.0.2" |
23 | #define EDAC_MOD_STR "amd76x_edac" | 23 | #define EDAC_MOD_STR "amd76x_edac" |
24 | 24 | ||
25 | #define amd76x_printk(level, fmt, arg...) \ | 25 | #define amd76x_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c index 35b78d04bbfa..ddd890052ce2 100644 --- a/drivers/edac/amd8111_edac.c +++ b/drivers/edac/amd8111_edac.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "edac_module.h" | 33 | #include "edac_module.h" |
34 | #include "amd8111_edac.h" | 34 | #include "amd8111_edac.h" |
35 | 35 | ||
36 | #define AMD8111_EDAC_REVISION " Ver: 1.0.0 " __DATE__ | 36 | #define AMD8111_EDAC_REVISION " Ver: 1.0.0" |
37 | #define AMD8111_EDAC_MOD_STR "amd8111_edac" | 37 | #define AMD8111_EDAC_MOD_STR "amd8111_edac" |
38 | 38 | ||
39 | #define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 | 39 | #define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 |
diff --git a/drivers/edac/amd8131_edac.c b/drivers/edac/amd8131_edac.c index b432d60c622a..a5c680561c73 100644 --- a/drivers/edac/amd8131_edac.c +++ b/drivers/edac/amd8131_edac.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #include "edac_module.h" | 33 | #include "edac_module.h" |
34 | #include "amd8131_edac.h" | 34 | #include "amd8131_edac.h" |
35 | 35 | ||
36 | #define AMD8131_EDAC_REVISION " Ver: 1.0.0 " __DATE__ | 36 | #define AMD8131_EDAC_REVISION " Ver: 1.0.0" |
37 | #define AMD8131_EDAC_MOD_STR "amd8131_edac" | 37 | #define AMD8131_EDAC_MOD_STR "amd8131_edac" |
38 | 38 | ||
39 | /* Wrapper functions for accessing PCI configuration space */ | 39 | /* Wrapper functions for accessing PCI configuration space */ |
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c index 837ad8f85b48..a687a0d16962 100644 --- a/drivers/edac/cpc925_edac.c +++ b/drivers/edac/cpc925_edac.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "edac_core.h" | 30 | #include "edac_core.h" |
31 | #include "edac_module.h" | 31 | #include "edac_module.h" |
32 | 32 | ||
33 | #define CPC925_EDAC_REVISION " Ver: 1.0.0 " __DATE__ | 33 | #define CPC925_EDAC_REVISION " Ver: 1.0.0" |
34 | #define CPC925_EDAC_MOD_STR "cpc925_edac" | 34 | #define CPC925_EDAC_MOD_STR "cpc925_edac" |
35 | 35 | ||
36 | #define cpc925_printk(level, fmt, arg...) \ | 36 | #define cpc925_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index ec302d426589..1af531a11d21 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/edac.h> | 24 | #include <linux/edac.h> |
25 | #include "edac_core.h" | 25 | #include "edac_core.h" |
26 | 26 | ||
27 | #define E752X_REVISION " Ver: 2.0.2 " __DATE__ | 27 | #define E752X_REVISION " Ver: 2.0.2" |
28 | #define EDAC_MOD_STR "e752x_edac" | 28 | #define EDAC_MOD_STR "e752x_edac" |
29 | 29 | ||
30 | static int report_non_memory_errors; | 30 | static int report_non_memory_errors; |
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index 1731d7245816..6ffb6d23281f 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/edac.h> | 29 | #include <linux/edac.h> |
30 | #include "edac_core.h" | 30 | #include "edac_core.h" |
31 | 31 | ||
32 | #define E7XXX_REVISION " Ver: 2.0.2 " __DATE__ | 32 | #define E7XXX_REVISION " Ver: 2.0.2" |
33 | #define EDAC_MOD_STR "e7xxx_edac" | 33 | #define EDAC_MOD_STR "e7xxx_edac" |
34 | 34 | ||
35 | #define e7xxx_printk(level, fmt, arg...) \ | 35 | #define e7xxx_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/edac_module.c b/drivers/edac/edac_module.c index be4b075c3098..5ddaa86d6a6e 100644 --- a/drivers/edac/edac_module.c +++ b/drivers/edac/edac_module.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include "edac_core.h" | 15 | #include "edac_core.h" |
16 | #include "edac_module.h" | 16 | #include "edac_module.h" |
17 | 17 | ||
18 | #define EDAC_VERSION "Ver: 2.1.0 " __DATE__ | 18 | #define EDAC_VERSION "Ver: 2.1.0" |
19 | 19 | ||
20 | #ifdef CONFIG_EDAC_DEBUG | 20 | #ifdef CONFIG_EDAC_DEBUG |
21 | /* Values of 0 to 4 will generate output */ | 21 | /* Values of 0 to 4 will generate output */ |
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index 87f427c2ce5c..4dc3ac25a422 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c | |||
@@ -27,7 +27,7 @@ | |||
27 | /* | 27 | /* |
28 | * Alter this version for the I5000 module when modifications are made | 28 | * Alter this version for the I5000 module when modifications are made |
29 | */ | 29 | */ |
30 | #define I5000_REVISION " Ver: 2.0.12 " __DATE__ | 30 | #define I5000_REVISION " Ver: 2.0.12" |
31 | #define EDAC_MOD_STR "i5000_edac" | 31 | #define EDAC_MOD_STR "i5000_edac" |
32 | 32 | ||
33 | #define i5000_printk(level, fmt, arg...) \ | 33 | #define i5000_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c index 80a465efbae8..74d6ec342afb 100644 --- a/drivers/edac/i5400_edac.c +++ b/drivers/edac/i5400_edac.c | |||
@@ -33,7 +33,7 @@ | |||
33 | /* | 33 | /* |
34 | * Alter this version for the I5400 module when modifications are made | 34 | * Alter this version for the I5400 module when modifications are made |
35 | */ | 35 | */ |
36 | #define I5400_REVISION " Ver: 1.0.0 " __DATE__ | 36 | #define I5400_REVISION " Ver: 1.0.0" |
37 | 37 | ||
38 | #define EDAC_MOD_STR "i5400_edac" | 38 | #define EDAC_MOD_STR "i5400_edac" |
39 | 39 | ||
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 363cc1602944..a76fe8366b68 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c | |||
@@ -31,7 +31,7 @@ | |||
31 | /* | 31 | /* |
32 | * Alter this version for the I7300 module when modifications are made | 32 | * Alter this version for the I7300 module when modifications are made |
33 | */ | 33 | */ |
34 | #define I7300_REVISION " Ver: 1.0.0 " __DATE__ | 34 | #define I7300_REVISION " Ver: 1.0.0" |
35 | 35 | ||
36 | #define EDAC_MOD_STR "i7300_edac" | 36 | #define EDAC_MOD_STR "i7300_edac" |
37 | 37 | ||
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index 465cbc25149f..04f1e7ce02b1 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c | |||
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(use_pci_fixup, "Enable PCI fixup to seek for hidden devices"); | |||
59 | /* | 59 | /* |
60 | * Alter this version for the module when modifications are made | 60 | * Alter this version for the module when modifications are made |
61 | */ | 61 | */ |
62 | #define I7CORE_REVISION " Ver: 1.0.0 " __DATE__ | 62 | #define I7CORE_REVISION " Ver: 1.0.0" |
63 | #define EDAC_MOD_STR "i7core_edac" | 63 | #define EDAC_MOD_STR "i7core_edac" |
64 | 64 | ||
65 | /* | 65 | /* |
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c index b8a95cf50718..931a05775049 100644 --- a/drivers/edac/i82860_edac.c +++ b/drivers/edac/i82860_edac.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/edac.h> | 16 | #include <linux/edac.h> |
17 | #include "edac_core.h" | 17 | #include "edac_core.h" |
18 | 18 | ||
19 | #define I82860_REVISION " Ver: 2.0.2 " __DATE__ | 19 | #define I82860_REVISION " Ver: 2.0.2" |
20 | #define EDAC_MOD_STR "i82860_edac" | 20 | #define EDAC_MOD_STR "i82860_edac" |
21 | 21 | ||
22 | #define i82860_printk(level, fmt, arg...) \ | 22 | #define i82860_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index b2fd1e899142..33864c63c684 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/edac.h> | 20 | #include <linux/edac.h> |
21 | #include "edac_core.h" | 21 | #include "edac_core.h" |
22 | 22 | ||
23 | #define I82875P_REVISION " Ver: 2.0.2 " __DATE__ | 23 | #define I82875P_REVISION " Ver: 2.0.2" |
24 | #define EDAC_MOD_STR "i82875p_edac" | 24 | #define EDAC_MOD_STR "i82875p_edac" |
25 | 25 | ||
26 | #define i82875p_printk(level, fmt, arg...) \ | 26 | #define i82875p_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index 92e65e7038e9..a5da732fe5b2 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <linux/edac.h> | 16 | #include <linux/edac.h> |
17 | #include "edac_core.h" | 17 | #include "edac_core.h" |
18 | 18 | ||
19 | #define I82975X_REVISION " Ver: 1.0.0 " __DATE__ | 19 | #define I82975X_REVISION " Ver: 1.0.0" |
20 | #define EDAC_MOD_STR "i82975x_edac" | 20 | #define EDAC_MOD_STR "i82975x_edac" |
21 | 21 | ||
22 | #define i82975x_printk(level, fmt, arg...) \ | 22 | #define i82975x_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/mpc85xx_edac.h b/drivers/edac/mpc85xx_edac.h index cb24df839460..932016f2cf06 100644 --- a/drivers/edac/mpc85xx_edac.h +++ b/drivers/edac/mpc85xx_edac.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef _MPC85XX_EDAC_H_ | 11 | #ifndef _MPC85XX_EDAC_H_ |
12 | #define _MPC85XX_EDAC_H_ | 12 | #define _MPC85XX_EDAC_H_ |
13 | 13 | ||
14 | #define MPC85XX_REVISION " Ver: 2.0.0 " __DATE__ | 14 | #define MPC85XX_REVISION " Ver: 2.0.0" |
15 | #define EDAC_MOD_STR "MPC85xx_edac" | 15 | #define EDAC_MOD_STR "MPC85xx_edac" |
16 | 16 | ||
17 | #define mpc85xx_printk(level, fmt, arg...) \ | 17 | #define mpc85xx_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/mv64x60_edac.h b/drivers/edac/mv64x60_edac.h index e042e2daa8f4..c7f209c92a1a 100644 --- a/drivers/edac/mv64x60_edac.h +++ b/drivers/edac/mv64x60_edac.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #ifndef _MV64X60_EDAC_H_ | 12 | #ifndef _MV64X60_EDAC_H_ |
13 | #define _MV64X60_EDAC_H_ | 13 | #define _MV64X60_EDAC_H_ |
14 | 14 | ||
15 | #define MV64x60_REVISION " Ver: 2.0.0 " __DATE__ | 15 | #define MV64x60_REVISION " Ver: 2.0.0" |
16 | #define EDAC_MOD_STR "MV64x60_edac" | 16 | #define EDAC_MOD_STR "MV64x60_edac" |
17 | 17 | ||
18 | #define mv64x60_printk(level, fmt, arg...) \ | 18 | #define mv64x60_printk(level, fmt, arg...) \ |
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c index af8e7b1aa290..0de7d8770891 100644 --- a/drivers/edac/ppc4xx_edac.c +++ b/drivers/edac/ppc4xx_edac.c | |||
@@ -113,7 +113,7 @@ | |||
113 | #define EDAC_OPSTATE_UNKNOWN_STR "unknown" | 113 | #define EDAC_OPSTATE_UNKNOWN_STR "unknown" |
114 | 114 | ||
115 | #define PPC4XX_EDAC_MODULE_NAME "ppc4xx_edac" | 115 | #define PPC4XX_EDAC_MODULE_NAME "ppc4xx_edac" |
116 | #define PPC4XX_EDAC_MODULE_REVISION "v1.0.0 " __DATE__ | 116 | #define PPC4XX_EDAC_MODULE_REVISION "v1.0.0" |
117 | 117 | ||
118 | #define PPC4XX_EDAC_MESSAGE_SIZE 256 | 118 | #define PPC4XX_EDAC_MESSAGE_SIZE 256 |
119 | 119 | ||
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c index 678513738c33..b153674431f1 100644 --- a/drivers/edac/r82600_edac.c +++ b/drivers/edac/r82600_edac.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/edac.h> | 22 | #include <linux/edac.h> |
23 | #include "edac_core.h" | 23 | #include "edac_core.h" |
24 | 24 | ||
25 | #define R82600_REVISION " Ver: 2.0.2 " __DATE__ | 25 | #define R82600_REVISION " Ver: 2.0.2" |
26 | #define EDAC_MOD_STR "r82600_edac" | 26 | #define EDAC_MOD_STR "r82600_edac" |
27 | 27 | ||
28 | #define r82600_printk(level, fmt, arg...) \ | 28 | #define r82600_printk(level, fmt, arg...) \ |
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 | /* |
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index 5c2a9058c09f..e83e84003025 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c | |||
@@ -412,8 +412,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d | |||
412 | goto err_out_free_region; | 412 | goto err_out_free_region; |
413 | } | 413 | } |
414 | 414 | ||
415 | v4l2_info(v4l2_dev, "version " DRIVER_VERSION | 415 | v4l2_info(v4l2_dev, "version " DRIVER_VERSION "\n"); |
416 | " time " __TIME__ " " __DATE__ "\n"); | ||
417 | 416 | ||
418 | v4l2_info(v4l2_dev, "found Guillemot MAXI Radio device (io = 0x%x)\n", | 417 | v4l2_info(v4l2_dev, "found Guillemot MAXI Radio device (io = 0x%x)\n", |
419 | dev->io); | 418 | dev->io); |
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index 280df43ca446..8d7813415760 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c | |||
@@ -1354,7 +1354,7 @@ void cx231xx_dump_SC_reg(struct cx231xx *dev) | |||
1354 | { | 1354 | { |
1355 | u8 value[4] = { 0, 0, 0, 0 }; | 1355 | u8 value[4] = { 0, 0, 0, 0 }; |
1356 | int status = 0; | 1356 | int status = 0; |
1357 | cx231xx_info("cx231xx_dump_SC_reg %s!\n", __TIME__); | 1357 | cx231xx_info("cx231xx_dump_SC_reg!\n"); |
1358 | 1358 | ||
1359 | status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT, | 1359 | status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT, |
1360 | value, 4); | 1360 | value, 4); |
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index a3c0dc9d8b98..9537aaa50c2f 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c | |||
@@ -69,7 +69,7 @@ static const char paranoia_str[] = KERN_ERR | |||
69 | 69 | ||
70 | static const char bc_drvname[] = "baycom_epp"; | 70 | static const char bc_drvname[] = "baycom_epp"; |
71 | static const char bc_drvinfo[] = KERN_INFO "baycom_epp: (C) 1998-2000 Thomas Sailer, HB9JNX/AE4WA\n" | 71 | static const char bc_drvinfo[] = KERN_INFO "baycom_epp: (C) 1998-2000 Thomas Sailer, HB9JNX/AE4WA\n" |
72 | "baycom_epp: version 0.7 compiled " __TIME__ " " __DATE__ "\n"; | 72 | "baycom_epp: version 0.7\n"; |
73 | 73 | ||
74 | /* --------------------------------------------------------------------- */ | 74 | /* --------------------------------------------------------------------- */ |
75 | 75 | ||
diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index 5f5af9a606f8..279d2296290a 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c | |||
@@ -102,7 +102,7 @@ | |||
102 | 102 | ||
103 | static const char bc_drvname[] = "baycom_par"; | 103 | static const char bc_drvname[] = "baycom_par"; |
104 | static const char bc_drvinfo[] = KERN_INFO "baycom_par: (C) 1996-2000 Thomas Sailer, HB9JNX/AE4WA\n" | 104 | static const char bc_drvinfo[] = KERN_INFO "baycom_par: (C) 1996-2000 Thomas Sailer, HB9JNX/AE4WA\n" |
105 | "baycom_par: version 0.9 compiled " __TIME__ " " __DATE__ "\n"; | 105 | "baycom_par: version 0.9\n"; |
106 | 106 | ||
107 | /* --------------------------------------------------------------------- */ | 107 | /* --------------------------------------------------------------------- */ |
108 | 108 | ||
diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c index 3e25f10cabd6..99cdce33df8b 100644 --- a/drivers/net/hamradio/baycom_ser_fdx.c +++ b/drivers/net/hamradio/baycom_ser_fdx.c | |||
@@ -92,7 +92,7 @@ | |||
92 | 92 | ||
93 | static const char bc_drvname[] = "baycom_ser_fdx"; | 93 | static const char bc_drvname[] = "baycom_ser_fdx"; |
94 | static const char bc_drvinfo[] = KERN_INFO "baycom_ser_fdx: (C) 1996-2000 Thomas Sailer, HB9JNX/AE4WA\n" | 94 | static const char bc_drvinfo[] = KERN_INFO "baycom_ser_fdx: (C) 1996-2000 Thomas Sailer, HB9JNX/AE4WA\n" |
95 | "baycom_ser_fdx: version 0.10 compiled " __TIME__ " " __DATE__ "\n"; | 95 | "baycom_ser_fdx: version 0.10\n"; |
96 | 96 | ||
97 | /* --------------------------------------------------------------------- */ | 97 | /* --------------------------------------------------------------------- */ |
98 | 98 | ||
diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c index 1686f6dcbbce..d92fe6ca788f 100644 --- a/drivers/net/hamradio/baycom_ser_hdx.c +++ b/drivers/net/hamradio/baycom_ser_hdx.c | |||
@@ -80,7 +80,7 @@ | |||
80 | 80 | ||
81 | static const char bc_drvname[] = "baycom_ser_hdx"; | 81 | static const char bc_drvname[] = "baycom_ser_hdx"; |
82 | static const char bc_drvinfo[] = KERN_INFO "baycom_ser_hdx: (C) 1996-2000 Thomas Sailer, HB9JNX/AE4WA\n" | 82 | static const char bc_drvinfo[] = KERN_INFO "baycom_ser_hdx: (C) 1996-2000 Thomas Sailer, HB9JNX/AE4WA\n" |
83 | "baycom_ser_hdx: version 0.10 compiled " __TIME__ " " __DATE__ "\n"; | 83 | "baycom_ser_hdx: version 0.10\n"; |
84 | 84 | ||
85 | /* --------------------------------------------------------------------- */ | 85 | /* --------------------------------------------------------------------- */ |
86 | 86 | ||
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 5b37579e84b7..a4a3516b6bbf 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
@@ -749,7 +749,7 @@ EXPORT_SYMBOL(hdlcdrv_unregister); | |||
749 | static int __init hdlcdrv_init_driver(void) | 749 | static int __init hdlcdrv_init_driver(void) |
750 | { | 750 | { |
751 | printk(KERN_INFO "hdlcdrv: (C) 1996-2000 Thomas Sailer HB9JNX/AE4WA\n"); | 751 | printk(KERN_INFO "hdlcdrv: (C) 1996-2000 Thomas Sailer HB9JNX/AE4WA\n"); |
752 | printk(KERN_INFO "hdlcdrv: version 0.8 compiled " __TIME__ " " __DATE__ "\n"); | 752 | printk(KERN_INFO "hdlcdrv: version 0.8\n"); |
753 | return 0; | 753 | return 0; |
754 | } | 754 | } |
755 | 755 | ||
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 737b59f1a8dc..9617d3d0ee39 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -3242,8 +3242,7 @@ static inline void show_version(void) | |||
3242 | rcsdate++; | 3242 | rcsdate++; |
3243 | tmp = strrchr(rcsdate, ' '); | 3243 | tmp = strrchr(rcsdate, ' '); |
3244 | *tmp = '\0'; | 3244 | *tmp = '\0'; |
3245 | printk(KERN_INFO "Cyclades-PC300 driver %s %s (built %s %s)\n", | 3245 | printk(KERN_INFO "Cyclades-PC300 driver %s %s\n", rcsvers, rcsdate); |
3246 | rcsvers, rcsdate, __DATE__, __TIME__); | ||
3247 | } /* show_version */ | 3246 | } /* show_version */ |
3248 | 3247 | ||
3249 | static const struct net_device_ops cpc_netdev_ops = { | 3248 | static const struct net_device_ops cpc_netdev_ops = { |
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c index d3d7809af8bf..0dc34f12f92e 100644 --- a/drivers/parport/parport_ip32.c +++ b/drivers/parport/parport_ip32.c | |||
@@ -2203,7 +2203,6 @@ static __exit void parport_ip32_unregister_port(struct parport *p) | |||
2203 | static int __init parport_ip32_init(void) | 2203 | static int __init parport_ip32_init(void) |
2204 | { | 2204 | { |
2205 | pr_info(PPIP32 "SGI IP32 built-in parallel port driver v0.6\n"); | 2205 | pr_info(PPIP32 "SGI IP32 built-in parallel port driver v0.6\n"); |
2206 | pr_debug1(PPIP32 "Compiled on %s, %s\n", __DATE__, __TIME__); | ||
2207 | this_port = parport_ip32_probe_port(); | 2206 | this_port = parport_ip32_probe_port(); |
2208 | return IS_ERR(this_port) ? PTR_ERR(this_port) : 0; | 2207 | return IS_ERR(this_port) ? PTR_ERR(this_port) : 0; |
2209 | } | 2208 | } |
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 4ff26521d75f..3382475dc22d 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -59,7 +59,6 @@ | |||
59 | #ifndef AAC_DRIVER_BRANCH | 59 | #ifndef AAC_DRIVER_BRANCH |
60 | #define AAC_DRIVER_BRANCH "" | 60 | #define AAC_DRIVER_BRANCH "" |
61 | #endif | 61 | #endif |
62 | #define AAC_DRIVER_BUILD_DATE __DATE__ " " __TIME__ | ||
63 | #define AAC_DRIVERNAME "aacraid" | 62 | #define AAC_DRIVERNAME "aacraid" |
64 | 63 | ||
65 | #ifdef AAC_DRIVER_BUILD | 64 | #ifdef AAC_DRIVER_BUILD |
@@ -67,7 +66,7 @@ | |||
67 | #define str(x) _str(x) | 66 | #define str(x) _str(x) |
68 | #define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION "[" str(AAC_DRIVER_BUILD) "]" AAC_DRIVER_BRANCH | 67 | #define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION "[" str(AAC_DRIVER_BUILD) "]" AAC_DRIVER_BRANCH |
69 | #else | 68 | #else |
70 | #define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION AAC_DRIVER_BRANCH " " AAC_DRIVER_BUILD_DATE | 69 | #define AAC_DRIVER_FULL_VERSION AAC_DRIVER_VERSION AAC_DRIVER_BRANCH |
71 | #endif | 70 | #endif |
72 | 71 | ||
73 | MODULE_AUTHOR("Red Hat Inc and Adaptec"); | 72 | MODULE_AUTHOR("Red Hat Inc and Adaptec"); |
diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c index 92109b126391..112f1bec7756 100644 --- a/drivers/scsi/in2000.c +++ b/drivers/scsi/in2000.c | |||
@@ -2227,7 +2227,7 @@ static int in2000_proc_info(struct Scsi_Host *instance, char *buf, char **start, | |||
2227 | bp = buf; | 2227 | bp = buf; |
2228 | *bp = '\0'; | 2228 | *bp = '\0'; |
2229 | if (hd->proc & PR_VERSION) { | 2229 | if (hd->proc & PR_VERSION) { |
2230 | sprintf(tbuf, "\nVersion %s - %s. Compiled %s %s", IN2000_VERSION, IN2000_DATE, __DATE__, __TIME__); | 2230 | sprintf(tbuf, "\nVersion %s - %s.", IN2000_VERSION, IN2000_DATE); |
2231 | strcat(bp, tbuf); | 2231 | strcat(bp, tbuf); |
2232 | } | 2232 | } |
2233 | if (hd->proc & PR_INFO) { | 2233 | if (hd->proc & PR_INFO) { |
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, |
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index 34e4c915002e..f920baf3ff24 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h | |||
@@ -43,7 +43,6 @@ | |||
43 | #define PMCRAID_DRIVER_NAME "PMC MaxRAID" | 43 | #define PMCRAID_DRIVER_NAME "PMC MaxRAID" |
44 | #define PMCRAID_DEVFILE "pmcsas" | 44 | #define PMCRAID_DEVFILE "pmcsas" |
45 | #define PMCRAID_DRIVER_VERSION "1.0.3" | 45 | #define PMCRAID_DRIVER_VERSION "1.0.3" |
46 | #define PMCRAID_DRIVER_DATE __DATE__ | ||
47 | 46 | ||
48 | #define PMCRAID_FW_VERSION_1 0x002 | 47 | #define PMCRAID_FW_VERSION_1 0x002 |
49 | 48 | ||
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) { |
diff --git a/drivers/staging/generic_serial/rio/rioinit.c b/drivers/staging/generic_serial/rio/rioinit.c index 24a282bb89d4..fb62b383f1de 100644 --- a/drivers/staging/generic_serial/rio/rioinit.c +++ b/drivers/staging/generic_serial/rio/rioinit.c | |||
@@ -381,7 +381,7 @@ struct rioVersion *RIOVersid(void) | |||
381 | { | 381 | { |
382 | strlcpy(stVersion.version, "RIO driver for linux V1.0", | 382 | strlcpy(stVersion.version, "RIO driver for linux V1.0", |
383 | sizeof(stVersion.version)); | 383 | sizeof(stVersion.version)); |
384 | strlcpy(stVersion.buildDate, __DATE__, | 384 | strlcpy(stVersion.buildDate, "Aug 15 2010", |
385 | sizeof(stVersion.buildDate)); | 385 | sizeof(stVersion.buildDate)); |
386 | 386 | ||
387 | return &stVersion; | 387 | return &stVersion; |
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c index bfa05e801823..c0e8f2eeb886 100644 --- a/drivers/tty/cyclades.c +++ b/drivers/tty/cyclades.c | |||
@@ -4096,8 +4096,7 @@ static int __init cy_init(void) | |||
4096 | if (!cy_serial_driver) | 4096 | if (!cy_serial_driver) |
4097 | goto err; | 4097 | goto err; |
4098 | 4098 | ||
4099 | printk(KERN_INFO "Cyclades driver " CY_VERSION " (built %s %s)\n", | 4099 | printk(KERN_INFO "Cyclades driver " CY_VERSION "\n"); |
4100 | __DATE__, __TIME__); | ||
4101 | 4100 | ||
4102 | /* Initialize the tty_driver structure */ | 4101 | /* Initialize the tty_driver structure */ |
4103 | 4102 | ||
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index b1aecc7bb32a..fd347ff34d07 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c | |||
@@ -61,8 +61,7 @@ | |||
61 | #include <linux/delay.h> | 61 | #include <linux/delay.h> |
62 | 62 | ||
63 | 63 | ||
64 | #define VERSION_STRING DRIVER_DESC " 2.1d (build date: " \ | 64 | #define VERSION_STRING DRIVER_DESC " 2.1d" |
65 | __DATE__ " " __TIME__ ")" | ||
66 | 65 | ||
67 | /* Macros definitions */ | 66 | /* Macros definitions */ |
68 | 67 | ||
diff --git a/fs/dlm/main.c b/fs/dlm/main.c index b80e0aa3cfa5..5a59efa0bb46 100644 --- a/fs/dlm/main.c +++ b/fs/dlm/main.c | |||
@@ -50,7 +50,7 @@ static int __init init_dlm(void) | |||
50 | if (error) | 50 | if (error) |
51 | goto out_netlink; | 51 | goto out_netlink; |
52 | 52 | ||
53 | printk("DLM (built %s %s) installed\n", __DATE__, __TIME__); | 53 | printk("DLM installed\n"); |
54 | 54 | ||
55 | return 0; | 55 | return 0; |
56 | 56 | ||
diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c index cfa327d33194..c2b34cd2abe0 100644 --- a/fs/gfs2/main.c +++ b/fs/gfs2/main.c | |||
@@ -146,7 +146,7 @@ static int __init init_gfs2_fs(void) | |||
146 | 146 | ||
147 | gfs2_register_debugfs(); | 147 | gfs2_register_debugfs(); |
148 | 148 | ||
149 | printk("GFS2 (built %s %s) installed\n", __DATE__, __TIME__); | 149 | printk("GFS2 installed\n"); |
150 | 150 | ||
151 | return 0; | 151 | return 0; |
152 | 152 | ||
diff --git a/net/atm/lec.c b/net/atm/lec.c index 25073b6ef474..ba48daa68c1f 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -1171,7 +1171,7 @@ static int __init lane_module_init(void) | |||
1171 | #endif | 1171 | #endif |
1172 | 1172 | ||
1173 | register_atm_ioctl(&lane_ioctl_ops); | 1173 | register_atm_ioctl(&lane_ioctl_ops); |
1174 | pr_info("lec.c: " __DATE__ " " __TIME__ " initialized\n"); | 1174 | pr_info("lec.c: initialized\n"); |
1175 | return 0; | 1175 | return 0; |
1176 | } | 1176 | } |
1177 | 1177 | ||
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 644cdf071642..3ccca42e6f90 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
@@ -1482,7 +1482,7 @@ static __init int atm_mpoa_init(void) | |||
1482 | if (mpc_proc_init() != 0) | 1482 | if (mpc_proc_init() != 0) |
1483 | pr_info("failed to initialize /proc/mpoa\n"); | 1483 | pr_info("failed to initialize /proc/mpoa\n"); |
1484 | 1484 | ||
1485 | pr_info("mpc.c: " __DATE__ " " __TIME__ " initialized\n"); | 1485 | pr_info("mpc.c: initialized\n"); |
1486 | 1486 | ||
1487 | return 0; | 1487 | return 0; |
1488 | } | 1488 | } |