diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:25:41 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:25:41 +0200 |
commit | 9ae76f5d8ab546660cf517bb63c64de51800955d (patch) | |
tree | e6470cb84456e71f5e7d9a0131b7720c61cb334e /drivers/char/generic_nvram.c | |
parent | 948f984df52511bb0efa5c026813b0c34de43aa0 (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into safe-poison-pointerstip-safe-poison-pointers-2008-06-16_09.25_Mon
Diffstat (limited to 'drivers/char/generic_nvram.c')
-rw-r--r-- | drivers/char/generic_nvram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/generic_nvram.c b/drivers/char/generic_nvram.c index 2398e864c28d..a00869c650d5 100644 --- 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); } |