From patchwork Fri Jul 29 14:08:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Bottomley X-Patchwork-Id: 1020802 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6TE8ovp011524 for ; Fri, 29 Jul 2011 14:08:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751374Ab1G2OIt (ORCPT ); Fri, 29 Jul 2011 10:08:49 -0400 Received: from bedivere.hansenpartnership.com ([66.63.167.143]:59779 "EHLO bedivere.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750776Ab1G2OIt (ORCPT ); Fri, 29 Jul 2011 10:08:49 -0400 Received: from localhost (localhost [127.0.0.1]) by bedivere.hansenpartnership.com (Postfix) with ESMTP id B27298EE0DA; Fri, 29 Jul 2011 07:08:48 -0700 (PDT) Received: from bedivere.hansenpartnership.com ([127.0.0.1]) by localhost (bedivere.hansenpartnership.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Pr7mReplCYhy; Fri, 29 Jul 2011 07:08:48 -0700 (PDT) Received: from [10.30.19.253] (swsoft-msk-nat.sw.ru [195.214.232.10]) by bedivere.hansenpartnership.com (Postfix) with ESMTPSA id 2BC278EE08E; Fri, 29 Jul 2011 07:08:46 -0700 (PDT) Subject: sungem: fix compile failure caused by trivial #include consolidation From: James Bottomley To: David Miller , Vitaliy Ivanov , Jiri Kosina Cc: linux-kernel , Parisc List Date: Fri, 29 Jul 2011 18:08:44 +0400 Message-ID: <1311948524.8190.39.camel@mulgrave> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 (2.32.2-1.fc14) Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 29 Jul 2011 14:08:50 +0000 (UTC) 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 -- 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 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