Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

[karo-tx-linux.git] / arch / arm / mach-omap1 / dma.c

diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 3ef7d52316b49a959bce42fd142a3b8a61d9fd01..29007fef84cd8d884aaddd1c295897afa0c824ed 100644 (file)
--- a/arch/arm/mach-omap1/dma.c
+++ b/arch/arm/mach-omap1/dma.c
@@ -27,7 +27,8 @@
 
 #include <plat/dma.h>
 #include <plat/tc.h>
-#include <plat/irqs.h>
+
+#include <mach/irqs.h>
 
 #define OMAP1_DMA_BASE                 (0xfffed800)
 #define OMAP1_LOGICAL_DMA_CH_COUNT     17
@@ -330,8 +331,9 @@ static int __init omap1_system_dma_init(void)
        d->chan = kzalloc(sizeof(struct omap_dma_lch) *
                                        (d->lch_count), GFP_KERNEL);
        if (!d->chan) {
-               dev_err(&pdev->dev, "%s: Memory allocation failed"
-                                       "for d->chan!!!\n", __func__);
+               dev_err(&pdev->dev,
+                       "%s: Memory allocation failed for d->chan!\n",
+                       __func__);
                goto exit_release_d;
        }