linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH] ARM: shmobile: Rework multiplatform include workaround
Date: Mon, 04 Aug 2014 07:01:55 +0000	[thread overview]
Message-ID: <20140804070151.GA1889@verge.net.au> (raw)

On Thu, Jul 31, 2014 at 09:25:15AM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
> 
> Now when the majority of the include files have moved from
> arch/arm/mach-shmobile/include/mach/ to arch/arm/mach-shmobile/
> remove the header include file workaround in the Makefile...
> 
> ... and add another workaround in irqs.h to cope with the fact
> that <mach/irqs.h> needs to be where it is until the PFC code
> has been updated to remove legacy non-DT interfaces.
> 
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
> ---
> 
>  Written against renesas-devel-v3.16-rc7-20140729

Thanks, I have queued this up as a cleanup for v3.18.

> 
>  arch/arm/mach-shmobile/Makefile |    2 --
>  arch/arm/mach-shmobile/irqs.h   |    2 +-
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> --- 0001/arch/arm/mach-shmobile/Makefile
> +++ work/arch/arm/mach-shmobile/Makefile	2014-07-31 09:11:18.000000000 +0900
> @@ -2,8 +2,6 @@
>  # Makefile for the linux kernel.
>  #
>  
> -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
> -
>  # Common objects
>  obj-y				:= timer.o console.o
>  
> --- 0001/arch/arm/mach-shmobile/irqs.h
> +++ work/arch/arm/mach-shmobile/irqs.h	2014-07-31 09:12:56.000000000 +0900
> @@ -2,7 +2,7 @@
>  #define __SHMOBILE_IRQS_H
>  
>  #include <linux/sh_intc.h>
> -#include <mach/irqs.h>
> +#include "include/mach/irqs.h"
>  
>  /* GIC */
>  #define gic_spi(nr)		((nr) + 32)
> 

             reply	other threads:[~2014-08-04  7:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-04  7:01 Simon Horman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-07-31  0:25 [PATCH] ARM: shmobile: Rework multiplatform include workaround Magnus Damm

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=20140804070151.GA1889@verge.net.au \
    --to=horms@verge.net.au \
    --cc=linux-sh@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).