summaryrefslogtreecommitdiff
path: root/drivers/block/aoe/aoemain.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-19 00:51:05 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-19 00:51:05 (GMT)
commit17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4 (patch)
tree59e6b08c8a9ca24a5de36adb91ddc4cef8c63ed7 /drivers/block/aoe/aoemain.c
parentb6aefcce747b3bc54d701d3c329416d0c9616f10 (diff)
parent4ca5224f3ea4779054d96e885ca9b3980801ce13 (diff)
downloadlinux-fsl-qoriq-17e6c600b2bc4f15dd5f9144ccb8b5c5211dd6e4.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6: aoe: fix sysfs_create_file warnings aoe: revert printk macros aoe: update driver version aoe: remove sysfs comment aoe: use bio->bi_idx aoe: module parameter for device timeout aoe: zero copy write 2 of 2 aoe: improve retransmission heuristics aoe: jumbo frame support 2 of 2 aoe: clean up printks via macros aoe: jumbo frame support 1 of 2 aoe: zero copy write 1 of 2 aoe: remove unused NARGS enum aoe: update copyright date aoe: eliminate isbusy message
Diffstat (limited to 'drivers/block/aoe/aoemain.c')
-rw-r--r--drivers/block/aoe/aoemain.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c
index de08491..a04b7d6 100644
--- a/drivers/block/aoe/aoemain.c
+++ b/drivers/block/aoe/aoemain.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Coraid, Inc. See COPYING for GPL terms. */
+/* Copyright (c) 2006 Coraid, Inc. See COPYING for GPL terms. */
/*
* aoemain.c
* Module initialization routines, discover timer
@@ -84,13 +84,11 @@ aoe_init(void)
goto net_fail;
ret = register_blkdev(AOE_MAJOR, DEVICE_NAME);
if (ret < 0) {
- printk(KERN_ERR "aoe: aoeblk_init: can't register major\n");
+ printk(KERN_ERR "aoe: can't register major\n");
goto blkreg_fail;
}
- printk(KERN_INFO
- "aoe: aoe_init: AoE v%s initialised.\n",
- VERSION);
+ printk(KERN_INFO "aoe: AoE v%s initialised.\n", VERSION);
discover_timer(TINIT);
return 0;
@@ -103,7 +101,7 @@ aoe_init(void)
chr_fail:
aoedev_exit();
- printk(KERN_INFO "aoe: aoe_init: initialisation failure.\n");
+ printk(KERN_INFO "aoe: initialisation failure.\n");
return ret;
}