From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Bottomley Subject: sungem: fix compile failure caused by trivial #include consolidation Date: Fri, 29 Jul 2011 18:08:44 +0400 Message-ID: <1311948524.8190.39.camel@mulgrave> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: linux-kernel , Parisc List To: David Miller , Vitaliy Ivanov , Jiri Kosina Return-path: List-ID: List-Id: linux-parisc.vger.kernel.org This patch: commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f Author: Vitaliy Ivanov 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 --- 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 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 Signed-off-by: Jiri Kosina 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 #include #include +#include #ifdef CONFIG_SPARC #include -#include #endif #ifdef CONFIG_PPC_PMAC #include -#include #include #include #endif