diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-13 09:12:51 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 09:12:51 +0000 |
| commit | 72aaf09fda49f5919d98d65d35e5179f3acb0497 (patch) | |
| tree | 5fd25748f7f5640f8ee8efb86ddca88d12840791 /drivers/infiniband/hw/ehca/ehca_main.c | |
| parent | 67fbc2312312095acc2f19a0b601bac10f84cf9d (diff) | |
| parent | 58c2467355ed3154a12ee49d8f8236547145c9d3 (diff) | |
| download | op-kernel-dev-72aaf09fda49f5919d98d65d35e5179f3acb0497.zip op-kernel-dev-72aaf09fda49f5919d98d65d35e5179f3acb0497.tar.gz | |
Merge git://git.marvell.com/orion into devel
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_main.c')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index bb02a86..bec7e02 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c @@ -994,8 +994,7 @@ static int ehca_mem_notifier(struct notifier_block *nb, if (printk_timed_ratelimit(&ehca_dmem_warn_time, 30 * 1000)) ehca_gen_err("DMEM operations are not allowed" - "as long as an ehca adapter is" - "attached to the LPAR"); + "in conjunction with eHCA"); return NOTIFY_BAD; } } |
