git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[safe/jmp/linux-2.6]
/
drivers
/
char
/
generic_nvram.c
diff --git
a/drivers/char/generic_nvram.c
b/drivers/char/generic_nvram.c
index
2398e86
..
a00869c
100644
(file)
--- a/
drivers/char/generic_nvram.c
+++ b/
drivers/char/generic_nvram.c
@@
-133,7
+133,7
@@
static struct miscdevice nvram_dev = {
int __init nvram_init(void)
{
- printk(KERN_INFO "
Macintosh
non-volatile memory driver v%s\n",
+ printk(KERN_INFO "
Generic
non-volatile memory driver v%s\n",
NVRAM_VERSION);
return misc_register(&nvram_dev);
}