Skip to contentSkip to conversation

ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h

PATCH New Tony Lindgren 2 participants 4 messages Feb 11, 2013 – Mar 4, 2013

Subsystems (4)
lore
Share & tools
lore

Tony Lindgren

author reviewer
#0 lore raw

PATCH 1/1 ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h

Commit 16559ae4 (kgdb: remove #include <linux/serial_8250.h> from kgdb.h) had a side effect of breaking omap1_defconfig build as some headers were included indirectly:

arch/arm/mach-omap1/board-h2.c:249: error: ?INT_KEYBOARD? undeclared here (not in a function)
...

This worked earlier as linux/serial_8250.h included linux/serial_core.h, via linux/serial_8250.h from linux/kgdb.h. Fix this by including the necessary headers directly.

---

Arnd & Olof, can you please apply this to your non-critical fixes or some other branch that gets merged early on during the merge window?

arch/arm/mach-omap1/common.h +2 -0
@@ -31,6 +31,8 @@
 
 #include <plat/i2c.h>
 
+#include <mach/irqs.h>
+
 #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
 void omap7xx_map_io(void);
 #else
drivers/video/omap/lcd_ams_delta.c +1 -0
@@ -27,6 +27,7 @@
 #include <linux/lcd.h>
 #include <linux/gpio.h>
 
+#include <mach/hardware.h>
 #include <mach/board-ams-delta.h>
 
 #include "omapfb.h"
drivers/video/omap/lcd_osk.c +3 -0
@@ -24,7 +24,10 @@
 #include <linux/platform_device.h>
 
 #include <asm/gpio.h>
+
+#include <mach/hardware.h>
 #include <mach/mux.h>
+
 #include "omapfb.h"
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
author reviewer
#1 lore raw

PATCH 1/1 ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h

Quoted 11 lines · Tony Lindgren

Commit 16559ae4 (kgdb: remove #include <linux/serial_8250.h> from kgdb.h) had a side effect of breaking omap1_defconfig build as some headers were included indirectly:

arch/arm/mach-omap1/board-h2.c:249: error: ?INT_KEYBOARD? undeclared here (not in a function)
...

This worked earlier as linux/serial_8250.h included linux/serial_core.h, via linux/serial_8250.h from linux/kgdb.h. Fix this by including the necessary headers directly.

Quoted 7 lines

---

Arnd & Olof, can you please apply this to your non-critical fixes or some other branch that gets merged early on during the merge window?

I'll apply this into omap-for-v3.9-rc1/fixes.

Tony

Quoted 38 lines
arch/arm/mach-omap1/common.h +2 -0
@@ -31,6 +31,8 @@
 
 #include <plat/i2c.h>
 
+#include <mach/irqs.h>
+
 #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
 void omap7xx_map_io(void);
 #else
drivers/video/omap/lcd_ams_delta.c +1 -0
@@ -27,6 +27,7 @@
 #include <linux/lcd.h>
 #include <linux/gpio.h>
 
+#include <mach/hardware.h>
 #include <mach/board-ams-delta.h>
 
 #include "omapfb.h"
drivers/video/omap/lcd_osk.c +3 -1
@@ -24,7 +24,10 @@
 #include <linux/platform_device.h>
 
 #include <asm/gpio.h>
+
+#include <mach/hardware.h>
 #include <mach/mux.h>
+
 #include "omapfb.h"
 
 static int osk_panel_init(struct lcd_panel *panel, struct omapfb_device *fbdev)
--

To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw

PATCH 1/1 ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h

Quoted 6 lines · Tony Lindgren
Quoted 3 lines

Arnd & Olof, can you please apply this to your non-critical fixes or some other branch that gets merged early on during the merge window?

I'll apply this into omap-for-v3.9-rc1/fixes.

I totally missed this one from you, and I have a couple more such fixes for OMAP1 (and others) that I'll try to send out ASAP.

Arnd

author reviewer
#3 lore raw

PATCH 1/1 ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h

Quoted 10 lines · Arnd Bergmann
Quoted 6 lines · Tony Lindgren
Quoted 3 lines

Arnd & Olof, can you please apply this to your non-critical fixes or some other branch that gets merged early on during the merge window?

I'll apply this into omap-for-v3.9-rc1/fixes.

I totally missed this one from you, and I have a couple more such fixes for OMAP1 (and others) that I'll try to send out ASAP.

No problem. I have this and few other omap fixes queued up in omap-for-v3.9-rc1/fixes. Will send a pull req on Tuesday for that.

Regards,

Tony