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/parport | |
| 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/parport')
| -rw-r--r-- | drivers/parport/parport_ip32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c index d3d7809af8b..0dc34f12f92 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 | } |