diff mbox

[1/1] ARM: shmobile: Remove duplicate inclusion of dma-mapping.h in setup-r8a7740.c

Message ID 1353393549-1532-1-git-send-email-sachin.kamat@linaro.org
State Accepted
Headers show

Commit Message

Sachin Kamat Nov. 20, 2012, 6:39 a.m. UTC
linux/dma-mapping.h was included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/mach-shmobile/setup-r8a7740.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Comments

Sachin Kamat Nov. 27, 2012, 3:35 a.m. UTC | #1
ping

On 20 November 2012 12:09, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> linux/dma-mapping.h was included twice.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  arch/arm/mach-shmobile/setup-r8a7740.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
> index 0952224..878a07a 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7740.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7740.c
> @@ -27,7 +27,6 @@
>  #include <linux/serial_sci.h>
>  #include <linux/sh_dma.h>
>  #include <linux/sh_timer.h>
> -#include <linux/dma-mapping.h>
>  #include <mach/dma-register.h>
>  #include <mach/r8a7740.h>
>  #include <mach/pm-rmobile.h>
> --
> 1.7.4.1
>
Simon Horman Nov. 30, 2012, 8:56 a.m. UTC | #2
On Tue, Nov 27, 2012 at 09:05:25AM +0530, Sachin Kamat wrote:
> ping

Sorry for missing this. I have applied it now and
I expect it will be included in 3.9.
Sachin Kamat Dec. 3, 2012, 4:13 a.m. UTC | #3
On 30 November 2012 14:26, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Nov 27, 2012 at 09:05:25AM +0530, Sachin Kamat wrote:
>> ping
>
> Sorry for missing this. I have applied it now and

Thanks Simon.

> I expect it will be included in 3.9.

Oh. I thought it might get included in 3.8 itself.
Simon Horman Dec. 3, 2012, 7:29 a.m. UTC | #4
On Mon, Dec 03, 2012 at 09:43:14AM +0530, Sachin Kamat wrote:
> On 30 November 2012 14:26, Simon Horman <horms@verge.net.au> wrote:
> > On Tue, Nov 27, 2012 at 09:05:25AM +0530, Sachin Kamat wrote:
> >> ping
> >
> > Sorry for missing this. I have applied it now and
> 
> Thanks Simon.
> 
> > I expect it will be included in 3.9.
> 
> Oh. I thought it might get included in 3.8 itself.

Sorry, due to the path that patches for shmobile take to the kernel
its already a bit too late for 3.8.
diff mbox

Patch

diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 0952224..878a07a 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -27,7 +27,6 @@ 
 #include <linux/serial_sci.h>
 #include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
-#include <linux/dma-mapping.h>
 #include <mach/dma-register.h>
 #include <mach/r8a7740.h>
 #include <mach/pm-rmobile.h>