diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 13:49:13 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-08-01 13:49:13 +0900 |
commit | 91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e (patch) | |
tree | c96ed92413044a28d17783e84a8824bfd2437af1 /drivers/staging/ramster/r2net.c | |
parent | sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757 (diff) | |
parent | serial: sh-sci: fix compilation breakage, when DMA is enabled (diff) | |
download | linux-dev-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.tar.xz linux-dev-91ba548cfd5cc8ee93b9435527efb8fa4caf5c5e.zip |
Merge branch 'sh/dmaengine' into sh-latest
Diffstat (limited to 'drivers/staging/ramster/r2net.c')
-rw-r--r-- | drivers/staging/ramster/r2net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ramster/r2net.c b/drivers/staging/ramster/r2net.c index 2ee02204c43d..fc830c3ac74b 100644 --- a/drivers/staging/ramster/r2net.c +++ b/drivers/staging/ramster/r2net.c @@ -266,8 +266,8 @@ int ramster_remote_put(struct tmem_xhandle *xh, char *data, size_t size, static unsigned long cnt; cnt++; if (!(cnt&(cnt-1))) - pr_err("ramster_remote_put: message failed, " - "ret=%d, cnt=%lu\n", ret, cnt); + pr_err("ramster_remote_put: message failed, ret=%d, cnt=%lu\n", + ret, cnt); ret = -1; } #endif |