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

login
register
mail settings
Submitter Tony Lindgren
Date Feb. 11, 2013, 10:46 p.m.
Message ID <20130211224600.GB4801@atomide.com>
Download mbox | patch
Permalink /patch/219688/
State New
Headers show

Comments

Tony Lindgren - Feb. 11, 2013, 10:46 p.m.
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?
Tony Lindgren - March 4, 2013, 7:02 p.m.
* 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
Arnd Bergmann - March 4, 2013, 8:32 p.m.
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
Tony Lindgren - March 4, 2013, 9:23 p.m.
* 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

Patch

--- 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)