summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2013-09-10 16:30:21 +0530
committerSekhar Nori <nsekhar@ti.com>2013-09-19 14:56:03 +0530
commit53ed7812841f107786f69e0437831469ffdeeeee (patch)
tree4d89766cc60b31491bbb77dac0f7dca223cfd93c /arch/arm
parent272b98c6455f00884f0350f775c5342358ebb73f (diff)
downloadlinux-53ed7812841f107786f69e0437831469ffdeeeee.tar.gz
linux-53ed7812841f107786f69e0437831469ffdeeeee.tar.bz2
linux-53ed7812841f107786f69e0437831469ffdeeeee.zip
ARM: davinci: fix build breakage with DEBUG_LL
commit fcf7157 ("ARM: davinci: serial: get rid of davinci_uart_config") introduced build breakage because of a misplaced header file include which cause a bunch of errors when the file is included in assembly code (like debug-macro.S) Fix the build breakage. Reported-by: Alexander Holler <holler@ahsoftware.de> Tested-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-davinci/include/mach/serial.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h
index 52b8571b2e70..ce402cd21fa0 100644
--- a/arch/arm/mach-davinci/include/mach/serial.h
+++ b/arch/arm/mach-davinci/include/mach/serial.h
@@ -15,8 +15,6 @@
#include <mach/hardware.h>
-#include <linux/platform_device.h>
-
#define DAVINCI_UART0_BASE (IO_PHYS + 0x20000)
#define DAVINCI_UART1_BASE (IO_PHYS + 0x20400)
#define DAVINCI_UART2_BASE (IO_PHYS + 0x20800)
@@ -39,6 +37,8 @@
#define UART_DM646X_SCR_TX_WATERMARK 0x08
#ifndef __ASSEMBLY__
+#include <linux/platform_device.h>
+
extern int davinci_serial_init(struct platform_device *);
#endif