Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53ed7812 authored by Sekhar Nori's avatar Sekhar Nori
Browse files

ARM: davinci: fix build breakage with DEBUG_LL 



commit fcf7157b ("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: default avatarAlexander Holler <holler@ahsoftware.de>
Tested-by: default avatarAlexander Holler <holler@ahsoftware.de>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 272b98c6

arch/arm/mach-davinci/include/mach/serial.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,6 @@ 




#include <mach/hardware.h>

#include <mach/hardware.h>





#include <linux/platform_device.h>



#define DAVINCI_UART0_BASE	(IO_PHYS + 0x20000)

#define DAVINCI_UART0_BASE	(IO_PHYS + 0x20000)

#define DAVINCI_UART1_BASE	(IO_PHYS + 0x20400)

#define DAVINCI_UART1_BASE	(IO_PHYS + 0x20400)

#define DAVINCI_UART2_BASE	(IO_PHYS + 0x20800)

#define DAVINCI_UART2_BASE	(IO_PHYS + 0x20800)
@@ -39,6 +37,8 @@ 
#define UART_DM646X_SCR_TX_WATERMARK	0x08

#define UART_DM646X_SCR_TX_WATERMARK	0x08





#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

#include <linux/platform_device.h>



extern int davinci_serial_init(struct platform_device *);

extern int davinci_serial_init(struct platform_device *);

#endif

#endif