This patch: commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f Author: Vitaliy Ivanov <vitalivanov@xxxxxxxxx> 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@xxxxxxxxxxxxx> --- 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@xxxxxxxxx> 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@xxxxxxxxx> Signed-off-by: Jiri Kosina <jkosina@xxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html