diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 09:20:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 09:20:39 -0800 |
| commit | 3661f00e2097676847deb01add1a0918044bd816 (patch) | |
| tree | 5a78dc694217c446b09362913195ad7afcf38fdb /drivers/block/aoe/aoemain.c | |
| parent | 53846a21c1766326bb14ce8ab6e997a0c120675d (diff) | |
| parent | 0fdf109676d1eda4ff8199a9a3ee3f11c555c1b3 (diff) | |
| download | linux-3661f00e2097676847deb01add1a0918044bd816.tar.gz linux-3661f00e2097676847deb01add1a0918044bd816.tar.bz2 linux-3661f00e2097676847deb01add1a0918044bd816.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/aoe-2.6:
[PATCH] aoe [3/3]: update version to 22
[PATCH] aoe [2/3]: don't request ATA device ID on ATA error
[PATCH] aoe [1/3]: support multiple AoE listeners
[PATCH] aoe: do not stop retransmit timer when device goes down
[PATCH] aoe [8/8]: update driver version number
[PATCH] aoe [7/8]: update driver compatibility string
[PATCH] aoe [6/8]: update device information on last close
[PATCH] aoe [5/8]: allow network interface migration on packet retransmit
[PATCH] aoe [4/8]: use less confusing driver name
[PATCH] aoe [3/8]: increase allowed outstanding packets
[PATCH] aoe [2/8]: support dynamic resizing of AoE devices
[PATCH] aoe [1/8]: zero packet data after skb allocation
Diffstat (limited to 'drivers/block/aoe/aoemain.c')
| -rw-r--r-- | drivers/block/aoe/aoemain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c index 387588a3f4ba..de08491ebe66 100644 --- a/drivers/block/aoe/aoemain.c +++ b/drivers/block/aoe/aoemain.c @@ -11,7 +11,7 @@ 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 }; @@ -89,7 +89,7 @@ aoe_init(void) } printk(KERN_INFO - "aoe: aoe_init: AoE v2.6-%s initialised.\n", + "aoe: aoe_init: AoE v%s initialised.\n", VERSION); discover_timer(TINIT); return 0; |