diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 13:02:27 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 13:02:27 (GMT) |
| commit | b3fecf8cab6441527ab057c99d7e6a6d7f6713e5 (patch) | |
| tree | d327499840a25fbd1f81e49d5cb6769bdad382f5 /drivers/xen/tmem.c | |
| parent | 5b62efd8250d6a751c31d1972e96bfccd19c4679 (diff) | |
| parent | 83a44ac8bf4a8e6cbbf0c00ff281a482778f708a (diff) | |
| download | linux-fsl-qoriq-b3fecf8cab6441527ab057c99d7e6a6d7f6713e5.tar.xz | |
Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-3.10/mt-hybrid-finger-pen
Diffstat (limited to 'drivers/xen/tmem.c')
| -rw-r--r-- | drivers/xen/tmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c index 144564e..3ee836d 100644 --- a/drivers/xen/tmem.c +++ b/drivers/xen/tmem.c @@ -385,7 +385,7 @@ static int __init xen_tmem_init(void) if (old_ops.init != NULL) s = " (WARNING: frontswap_ops overridden)"; printk(KERN_INFO "frontswap enabled, RAM provided by " - "Xen Transcendent Memory\n"); + "Xen Transcendent Memory%s\n", s); } #endif #ifdef CONFIG_CLEANCACHE |