diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 08:45:43 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 08:45:43 +0100 |
| commit | 1ad2096c4eba144522d87541c4024b8c84e95051 (patch) | |
| tree | a149d469a4da72a7b6e6b777879b740046c4ebc9 /arch/arm/mm | |
| parent | Merge branches 'rmobile/ag5' and 'rmobile/fsi-despair' into rmobile-latest (diff) | |
| parent | ARM: mach-shmobile: enable MMCIF DMA on ap4evb (diff) | |
| download | linux-1ad2096c4eba144522d87541c4024b8c84e95051.tar.xz linux-1ad2096c4eba144522d87541c4024b8c84e95051.zip | |
Merge branch 'rmobile/mmcif' into rmobile-latest
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 17e7b0b57e49..55c17a6fb22f 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -206,8 +206,8 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn, */ if (pfn_valid(pfn)) { printk(KERN_WARNING "BUG: Your driver calls ioremap() on system memory. This leads\n" - KERN_WARNING "to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n" - KERN_WARNING "will fail in the next kernel release. Please fix your driver.\n"); + "to architecturally unpredictable behaviour on ARMv6+, and ioremap()\n" + "will fail in the next kernel release. Please fix your driver.\n"); WARN_ON(1); } |