From: Tony Lindgren <tony@atomide.com>
To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>
Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org
Subject: Re: [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
Date: Mon, 4 Mar 2013 11:02:39 -0800 [thread overview]
Message-ID: <20130304190238.GU11806@atomide.com> (raw)
In-Reply-To: <20130211224600.GB4801@atomide.com>
* 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
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h
Date: Mon, 4 Mar 2013 11:02:39 -0800 [thread overview]
Message-ID: <20130304190238.GU11806@atomide.com> (raw)
In-Reply-To: <20130211224600.GB4801@atomide.com>
* 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 at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2013-03-04 19:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 22:46 [PATCH] ARM: OMAP1: Fix build related to kgdb.h no longer including serial_8250.h Tony Lindgren
2013-02-11 22:46 ` Tony Lindgren
2013-03-04 19:02 ` Tony Lindgren [this message]
2013-03-04 19:02 ` Tony Lindgren
2013-03-04 20:32 ` Arnd Bergmann
2013-03-04 20:32 ` Arnd Bergmann
2013-03-04 21:23 ` Tony Lindgren
2013-03-04 21:23 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130304190238.GU11806@atomide.com \
--to=tony@atomide.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.