Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / tile / include / asm / io.h

diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index d372641..6ef4eca 100644 (file)
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
@@ -396,8 +396,7 @@ extern void ioport_unmap(void __iomem *addr);
 static inline long ioport_panic(void)
 {
 #ifdef __tilegx__
-       panic("PCI IO space support is disabled. Configure the kernel with"
-             " CONFIG_TILE_PCI_IO to enable it");
+       panic("PCI IO space support is disabled. Configure the kernel with CONFIG_TILE_PCI_IO to enable it");
 #else
        panic("inb/outb and friends do not exist on tile");
 #endif
@@ -406,7 +405,7 @@ static inline long ioport_panic(void)
 
 static inline void __iomem *ioport_map(unsigned long port, unsigned int len)
 {
-       pr_info("ioport_map: mapping IO resources is unsupported on tile.\n");
+       pr_info("ioport_map: mapping IO resources is unsupported on tile\n");
        return NULL;
 }