projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into timers/urgent
[linux-2.6-block.git]
/
drivers
/
iommu
/
omap-iovmm.c
diff --git
a/drivers/iommu/omap-iovmm.c
b/drivers/iommu/omap-iovmm.c
index 46d87569073951c7c63cbd13a354e9ff91a0941f..d14725984153b149aa6946b8bff8d8e69f30d108 100644
(file)
--- a/
drivers/iommu/omap-iovmm.c
+++ b/
drivers/iommu/omap-iovmm.c
@@
-102,8
+102,8
@@
static size_t sgtable_len(const struct sg_table *sgt)
}
if (i && sg->offset) {
- pr_err("%s: sg[%d] offset not allowed in internal
"
-
"entries\n",
__func__, i);
+ pr_err("%s: sg[%d] offset not allowed in internal
entries\n",
+ __func__, i);
return 0;
}