Skip to contentSkip to conversation

ARM: davinci: fix build breakage with DEBUG_LL

PATCH New Sekhar Nori 2 participants 3 messages Sep 10, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
Applies to latest linus/master

 arch/arm/mach-davinci/include/mach/serial.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/include/mach/serial.h +2 -2
index 52b8571..ce402cd 100644
@@ -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
 
Signature · 1 line
1.7.10.1
#1 lore raw

PATCH 1/1 ARM: davinci: fix build breakage with DEBUG_LL

Hello Sekhar,

just what I did here to fix it. So you can add a Tested-By or Acked-By if you wish.

Thanks,

Alexander Holler

Am 10.09.2013 15:23, schrieb Sekhar Nori:

Quoted 38 lines

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.

---
Applies to latest linus/master

  arch/arm/mach-davinci/include/mach/serial.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-davinci/include/mach/serial.h +2 -2
index 52b8571..ce402cd 100644
@@ -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
 
#2 lore raw

PATCH 1/1 ARM: davinci: fix build breakage with DEBUG_LL

Quoted 4 lines · Alexander Holler

Hello Sekhar,

just what I did here to fix it. So you can add a Tested-By or Acked-By if you wish.

Sure. I will add your Tested-By.

Regards,
Sekhar