git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
block
/
aoe
/
aoemain.c
diff --git
a/drivers/block/aoe/aoemain.c
b/drivers/block/aoe/aoemain.c
index
387588a
..
a04b7d6
100644
(file)
--- a/
drivers/block/aoe/aoemain.c
+++ b/
drivers/block/aoe/aoemain.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 200
4
Coraid, Inc. See COPYING for GPL terms. */
+/* Copyright (c) 200
6
Coraid, Inc. See COPYING for GPL terms. */
/*
* aoemain.c
* Module initialization routines, discover timer
/*
* aoemain.c
* Module initialization routines, discover timer
@@
-11,7
+11,7
@@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Sam Hopkins <sah@coraid.com>");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Sam Hopkins <sah@coraid.com>");
-MODULE_DESCRIPTION("AoE block/char driver for 2.6.
[0-9]+
");
+MODULE_DESCRIPTION("AoE block/char driver for 2.6.
2 and newer 2.6 kernels
");
MODULE_VERSION(VERSION);
enum { TINIT, TRUN, TKILL };
MODULE_VERSION(VERSION);
enum { TINIT, TRUN, TKILL };
@@
-84,13
+84,11
@@
aoe_init(void)
goto net_fail;
ret = register_blkdev(AOE_MAJOR, DEVICE_NAME);
if (ret < 0) {
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;
}
goto blkreg_fail;
}
- printk(KERN_INFO
- "aoe: aoe_init: AoE v2.6-%s initialised.\n",
- VERSION);
+ printk(KERN_INFO "aoe: AoE v%s initialised.\n", VERSION);
discover_timer(TINIT);
return 0;
discover_timer(TINIT);
return 0;
@@
-103,7
+101,7
@@
aoe_init(void)
chr_fail:
aoedev_exit();
chr_fail:
aoedev_exit();
- printk(KERN_INFO "aoe:
aoe_init:
initialisation failure.\n");
+ printk(KERN_INFO "aoe: initialisation failure.\n");
return ret;
}
return ret;
}