lkml.org 
[lkml]   [2011]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: sungem: fix compile failure caused by trivial #include consolidation
From
Date
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




\
 
 \ /
  Last update: 2011-07-29 16:25    [W:0.095 / U:0.096 seconds]
©2003-2014 Jasper Spaans. Advertise on this site