* [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
@ 2013-02-11 22:46 Tony Lindgren
2013-03-04 19:02 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Tony Lindgren @ 2013-02-11 22:46 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-arm-kernel, linux-omap
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.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
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?
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -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
--- a/drivers/video/omap/lcd_ams_delta.c
+++ b/drivers/video/omap/lcd_ams_delta.c
@@ -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"
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
2013-02-11 22:46 [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h Tony Lindgren
@ 2013-03-04 19:02 ` Tony Lindgren
2013-03-04 20:32 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Tony Lindgren @ 2013-03-04 19:02 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-arm-kernel, linux-omap
* Tony Lindgren <tony@atomide.com> [130211 14:49]:
> 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.
>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
> ---
>
> 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
> --- a/arch/arm/mach-omap1/common.h
> +++ b/arch/arm/mach-omap1/common.h
> @@ -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
> --- a/drivers/video/omap/lcd_ams_delta.c
> +++ b/drivers/video/omap/lcd_ams_delta.c
> @@ -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"
> --- a/drivers/video/omap/lcd_osk.c
> +++ b/drivers/video/omap/lcd_osk.c
> @@ -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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
2013-03-04 19:02 ` Tony Lindgren
@ 2013-03-04 20:32 ` Arnd Bergmann
2013-03-04 21:23 ` Tony Lindgren
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2013-03-04 20:32 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Olof Johansson, linux-arm-kernel, linux-omap
On Monday 04 March 2013, Tony Lindgren wrote:
> > 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
2013-03-04 20:32 ` Arnd Bergmann
@ 2013-03-04 21:23 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2013-03-04 21:23 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Olof Johansson, linux-arm-kernel, linux-omap
* Arnd Bergmann <arnd@arndb.de> [130304 12:36]:
> On Monday 04 March 2013, Tony Lindgren wrote:
> > > 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-04 21:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-11 22:46 [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h Tony Lindgren
2013-03-04 19:02 ` Tony Lindgren
2013-03-04 20:32 ` Arnd Bergmann
2013-03-04 21:23 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).