[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1311948524.8190.39.camel@mulgrave>
Date: Fri, 29 Jul 2011 18:08:44 +0400
From: James Bottomley <James.Bottomley@...senPartnership.com>
To: David Miller <davem@...emloft.net>,
Vitaliy Ivanov <vitalivanov@...il.com>,
Jiri Kosina <jkosina@...e.cz>
Cc: linux-kernel <linux-kernel@...r.kernel.org>,
Parisc List <linux-parisc@...r.kernel.org>
Subject: sungem: fix compile failure caused by trivial #include
consolidation
This patch:
commit e44ba033c5654dbfda53461c9b1f7dd9bd1d198f
Author: Vitaliy Ivanov <vitalivanov@...il.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@...allels.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@...il.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@...il.com>
Signed-off-by: Jiri Kosina <jkosina@...e.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists