diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-25 22:26:14 -0500 |
| commit | 91e229bbad6524aabaac8717b2f559283670c37a (patch) | |
| tree | 84a55e4ac2dcf23add97bd9fde3e9cb232c12b30 /arch/um/kernel/initrd.c | |
| parent | 6e5e93424dc66542c548dfaa3bfebe30d46d50dd (diff) | |
| parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/um/kernel/initrd.c')
| -rw-r--r-- | arch/um/kernel/initrd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/initrd.c b/arch/um/kernel/initrd.c index fa015565001b..d386c75c88eb 100644 --- a/arch/um/kernel/initrd.c +++ b/arch/um/kernel/initrd.c | |||
| @@ -32,7 +32,7 @@ static int __init read_initrd(void) | |||
| 32 | * ask for no memory. | 32 | * ask for no memory. |
| 33 | */ | 33 | */ |
| 34 | if (size == 0) { | 34 | if (size == 0) { |
| 35 | printk(KERN_ERR "\"%\" is a zero-size initrd\n"); | 35 | printk(KERN_ERR "\"%s\" is a zero-size initrd\n", initrd); |
| 36 | return 0; | 36 | return 0; |
| 37 | } | 37 | } |
| 38 | 38 | ||