diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-01 15:16:53 -0500 |
commit | e6da74e1f20ea7822e52a9e4fbd3d25bd907e471 (patch) | |
tree | d9b3bc7e654fb788d1cf3a1759b1b3c74cc56a04 /drivers/s390/net/claw.c | |
parent | 1877c9ea66a29563987f22d0a86c66f438a87ce2 (diff) | |
parent | 3c3b809e256c417847f1a96b2f9d9f66c7fcb02c (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/s390/net/claw.c')
-rw-r--r-- | drivers/s390/net/claw.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index e70af7f39946..a86436a7a606 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
@@ -2,8 +2,6 @@ | |||
2 | * drivers/s390/net/claw.c | 2 | * drivers/s390/net/claw.c |
3 | * ESCON CLAW network driver | 3 | * ESCON CLAW network driver |
4 | * | 4 | * |
5 | * $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $ | ||
6 | * | ||
7 | * Linux for zSeries version | 5 | * Linux for zSeries version |
8 | * Copyright (C) 2002,2005 IBM Corporation | 6 | * Copyright (C) 2002,2005 IBM Corporation |
9 | * Author(s) Original code written by: | 7 | * Author(s) Original code written by: |
@@ -4391,14 +4389,7 @@ static int __init | |||
4391 | claw_init(void) | 4389 | claw_init(void) |
4392 | { | 4390 | { |
4393 | int ret = 0; | 4391 | int ret = 0; |
4394 | printk(KERN_INFO "claw: starting driver " | 4392 | printk(KERN_INFO "claw: starting driver\n"); |
4395 | #ifdef MODULE | ||
4396 | "module " | ||
4397 | #else | ||
4398 | "compiled into kernel " | ||
4399 | #endif | ||
4400 | " $Revision: 1.38 $ $Date: 2005/08/29 09:47:04 $ \n"); | ||
4401 | |||
4402 | 4393 | ||
4403 | #ifdef FUNCTRACE | 4394 | #ifdef FUNCTRACE |
4404 | printk(KERN_INFO "claw: %s() enter \n",__FUNCTION__); | 4395 | printk(KERN_INFO "claw: %s() enter \n",__FUNCTION__); |