From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Teresa Gámez" <t.gamez@phytec.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] OMAP4: small header cleanup
Date: Wed, 25 Jul 2012 08:36:47 +0200 [thread overview]
Message-ID: <20120725063647.GI30009@pengutronix.de> (raw)
In-Reply-To: <1343130303-32201-1-git-send-email-t.gamez@phytec.de>
On Tue, Jul 24, 2012 at 01:45:03PM +0200, Teresa Gámez wrote:
> Use <mach/clocks.h> for OMAP4.
>
> Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Applied, thanks
Sascha
> ---
> arch/arm/mach-omap/include/mach/clocks.h | 3 +++
> arch/arm/mach-omap/omap4_clock.c | 4 ++--
> arch/arm/mach-omap/omap4_generic.c | 5 ++---
> 3 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-omap/include/mach/clocks.h b/arch/arm/mach-omap/include/mach/clocks.h
> index 1221238..3efa057 100644
> --- a/arch/arm/mach-omap/include/mach/clocks.h
> +++ b/arch/arm/mach-omap/include/mach/clocks.h
> @@ -44,5 +44,8 @@
> #ifdef CONFIG_ARCH_OMAP3
> #include <mach/omap3-clock.h>
> #endif
> +#ifdef CONFIG_ARCH_OMAP4
> +#include <mach/omap4-clock.h>
> +#endif
>
> #endif /* __OMAP_CLOCKS_H_ */
> diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
> index f8bab5f..3ab01f0 100644
> --- a/arch/arm/mach-omap/omap4_clock.c
> +++ b/arch/arm/mach-omap/omap4_clock.c
> @@ -1,7 +1,7 @@
> #include <common.h>
> -#include <mach/syslib.h>
> #include <io.h>
> -#include <mach/omap4-clock.h>
> +#include <mach/syslib.h>
> +#include <mach/clocks.h>
>
> #define LDELAY 12000000
>
> diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
> index 5092242..de69934 100644
> --- a/arch/arm/mach-omap/omap4_generic.c
> +++ b/arch/arm/mach-omap/omap4_generic.c
> @@ -1,10 +1,9 @@
> #include <common.h>
> #include <init.h>
> -#include <mach/silicon.h>
> #include <io.h>
> -#include <mach/omap4-silicon.h>
> +#include <mach/clocks.h>
> +#include <mach/silicon.h>
> #include <mach/omap4-mux.h>
> -#include <mach/omap4-clock.h>
> #include <mach/syslib.h>
> #include <mach/xload.h>
> #include <mach/gpmc.h>
> --
> 1.7.0.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2012-07-25 6:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-24 11:45 Teresa Gámez
2012-07-25 6:36 ` Sascha Hauer [this message]
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=20120725063647.GI30009@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=t.gamez@phytec.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox