sungem: fix compile failure caused by trivial #include consolidation

sungem: fix compile failure caused by trivial #include consolidation

[James Bottomley]

This patch:

commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
Author: Vitaliy Ivanov <vitalivanov@gmail.com>
Date:   Mon Jun 20 16:08:07 2011 +0200

    treewide: remove duplicate includes

Causes this compile failure on parisc:

  CC [M]  drivers/net/sungem.o
drivers/net/sungem.c:49:22: error: asm/prom.h: No such file or directory
make[2]: *** [drivers/net/sungem.o] Error 1

Only Sparc and PPC actually have the asm/prom.h include, so you can't
consolidate it outside of the ifdefs.

Signed-off-by: James Bottomley <JBottomley@Parallels.com>

---

This really shouldn't be happening with a trivial patch, since it's an
obviously non-trivial transformation ... I assume the duplicate include
checker isn't taking #ifdefs into account?

James

commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
Author: Vitaliy Ivanov <vitalivanov@gmail.com>
Date:   Mon Jun 20 16:08:07 2011 +0200

    treewide: remove duplicate includes
    
    Many stupid corrections of duplicated includes based on the output of
    scripts/checkincludes.pl.
    
    Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index ab59300..70f018d 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -66,15 +66,14 @@
 #include <asm/byteorder.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
+#include <asm/prom.h>
 
 #ifdef CONFIG_SPARC
 #include <asm/idprom.h>
-#include <asm/prom.h>
 #endif
 
 #ifdef CONFIG_PPC_PMAC
 #include <asm/pci-bridge.h>
-#include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/pmac_feature.h>
 #endif

Re: sungem: fix compile failure caused by trivial #include consolidation

[Jiri Kosina]

On Fri, 29 Jul 2011, James Bottomley wrote:

> This patch:
> 
> commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
> Author: Vitaliy Ivanov <vitalivanov@gmail.com>
> Date:   Mon Jun 20 16:08:07 2011 +0200
> 
>     treewide: remove duplicate includes
> 
> Causes this compile failure on parisc:
> 
>   CC [M]  drivers/net/sungem.o
> drivers/net/sungem.c:49:22: error: asm/prom.h: No such file or directory
> make[2]: *** [drivers/net/sungem.o] Error 1
> 
> Only Sparc and PPC actually have the asm/prom.h include, so you can't
> consolidate it outside of the ifdefs.
> 
> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
> 
> ---
> 
> This really shouldn't be happening with a trivial patch, since it's an
> obviously non-trivial transformation ... I assume the duplicate include
> checker isn't taking #ifdefs into account?

Ah, right. I am afraid this was simply overlooked. David, do you want me 
to take this, or will you fix that up in your tree? (I am fine either 
way).

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: sungem: fix compile failure caused by trivial #include consolidation

[David Miller]

From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 29 Jul 2011 16:11:54 +0200 (CEST)

> On Fri, 29 Jul 2011, James Bottomley wrote:
> 
>> This patch:
>> 
>> commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
>> Author: Vitaliy Ivanov <vitalivanov@gmail.com>
>> Date:   Mon Jun 20 16:08:07 2011 +0200
>> 
>>     treewide: remove duplicate includes
>> 
>> Causes this compile failure on parisc:
>> 
>>   CC [M]  drivers/net/sungem.o
>> drivers/net/sungem.c:49:22: error: asm/prom.h: No such file or directory
>> make[2]: *** [drivers/net/sungem.o] Error 1
>> 
>> Only Sparc and PPC actually have the asm/prom.h include, so you can't
>> consolidate it outside of the ifdefs.
>> 
>> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
>> 
>> ---
>> 
>> This really shouldn't be happening with a trivial patch, since it's an
>> obviously non-trivial transformation ... I assume the duplicate include
>> checker isn't taking #ifdefs into account?
> 
> Ah, right. I am afraid this was simply overlooked. David, do you want me 
> to take this, or will you fix that up in your tree? (I am fine either 
> way).

Take what, although James signed off he seemd to simply repost your
patch again rather than a fix, unless I'm reading it wrong :-)

But yeah once there is a fix please push it.

Re: sungem: fix compile failure caused by trivial #include consolidation

[Jiri Kosina]

On Fri, 29 Jul 2011, David Miller wrote:

> >> This patch:
> >> 
> >> commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
> >> Author: Vitaliy Ivanov <vitalivanov@gmail.com>
> >> Date:   Mon Jun 20 16:08:07 2011 +0200
> >> 
> >>     treewide: remove duplicate includes
> >> 
> >> Causes this compile failure on parisc:
> >> 
> >>   CC [M]  drivers/net/sungem.o
> >> drivers/net/sungem.c:49:22: error: asm/prom.h: No such file or directory
> >> make[2]: *** [drivers/net/sungem.o] Error 1
> >> 
> >> Only Sparc and PPC actually have the asm/prom.h include, so you can't
> >> consolidate it outside of the ifdefs.
> >> 
> >> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
> >> 
> >> ---
> >> 
> >> This really shouldn't be happening with a trivial patch, since it's an
> >> obviously non-trivial transformation ... I assume the duplicate include
> >> checker isn't taking #ifdefs into account?
> > 
> > Ah, right. I am afraid this was simply overlooked. David, do you want me 
> > to take this, or will you fix that up in your tree? (I am fine either 
> > way).
> 
> Take what, although James signed off he seemd to simply repost your
> patch again rather than a fix, unless I'm reading it wrong :-)

Well yes, I think that James wanted to actually send a revert of that 
patch (as otherwise he wouldn't Sign-off on it) instead, right James? :)

> But yeah once there is a fix please push it.

So I'll revert that hunk with James' Reported-by, if there are no 
objections.

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: sungem: fix compile failure caused by trivial #include consolidation

[James Bottomley]

On Fri, 2011-07-29 at 07:17 -0700, David Miller wrote:
> From: Jiri Kosina <jkosina@suse.cz>
> Date: Fri, 29 Jul 2011 16:11:54 +0200 (CEST)
> 
> > On Fri, 29 Jul 2011, James Bottomley wrote:
> > 
> >> This patch:
> >> 
> >> commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
> >> Author: Vitaliy Ivanov <vitalivanov@gmail.com>
> >> Date:   Mon Jun 20 16:08:07 2011 +0200
> >> 
> >>     treewide: remove duplicate includes
> >> 
> >> Causes this compile failure on parisc:
> >> 
> >>   CC [M]  drivers/net/sungem.o
> >> drivers/net/sungem.c:49:22: error: asm/prom.h: No such file or directory
> >> make[2]: *** [drivers/net/sungem.o] Error 1
> >> 
> >> Only Sparc and PPC actually have the asm/prom.h include, so you can't
> >> consolidate it outside of the ifdefs.
> >> 
> >> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
> >> 
> >> ---
> >> 
> >> This really shouldn't be happening with a trivial patch, since it's an
> >> obviously non-trivial transformation ... I assume the duplicate include
> >> checker isn't taking #ifdefs into account?
> > 
> > Ah, right. I am afraid this was simply overlooked. David, do you want me 
> > to take this, or will you fix that up in your tree? (I am fine either 
> > way).
> 
> Take what, although James signed off he seemd to simply repost your
> patch again rather than a fix, unless I'm reading it wrong :-)

Oh, yes ... I applied it with patch -R, since I was finding the bit to
revert. Sorry,

James

> But yeah once there is a fix please push it.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html