From patchwork Sun Aug 9 12:59:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaswinder Singh Rajput X-Patchwork-Id: 31020 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 440ACB7B75 for ; Sun, 9 Aug 2009 23:01:10 +1000 (EST) Received: by ozlabs.org (Postfix) id 2E9D4DDD0C; Sun, 9 Aug 2009 23:01:10 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id B3ED2DDD0B for ; Sun, 9 Aug 2009 23:01:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753474AbZHINAv (ORCPT ); Sun, 9 Aug 2009 09:00:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753290AbZHINAv (ORCPT ); Sun, 9 Aug 2009 09:00:51 -0400 Received: from hera.kernel.org ([140.211.167.34]:53223 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753474AbZHINAu (ORCPT ); Sun, 9 Aug 2009 09:00:50 -0400 Received: from [192.168.1.220] (triband-del-59.180.74.103.bol.net.in [59.180.74.103] (may be forged)) (authenticated bits=0) by hera.kernel.org (8.14.2/8.13.8) with ESMTP id n79D0V9I023626 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sun, 9 Aug 2009 13:00:34 GMT Subject: [PATCH] net: cs89x0: includecheck fix for cs89x0.c From: Jaswinder Singh Rajput To: David Miller , netdev , Russwll Nelson , Andrew Morton , mcruse@cti-ltd.com Date: Sun, 09 Aug 2009 18:29:56 +0530 Message-Id: <1249822796.2957.4.camel@ht.satnam> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-2.fc10) X-Virus-Scanned: ClamAV 0.93.3/9668/Fri Aug 7 21:36:10 2009 on hera.kernel.org X-Virus-Status: Clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fix the following 'make includecheck' warning: drivers/net/cs89x0.c: asm/irq.h is included more than once. Signed-off-by: Jaswinder Singh Rajput --- drivers/net/cs89x0.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index ecf88ab..839cac5 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c @@ -177,13 +177,10 @@ static unsigned int cs8900_irq_map[] = {1,0,0,0}; #elif defined(CONFIG_MACH_IXDP2351) static unsigned int netcard_portlist[] __used __initdata = {IXDP2351_VIRT_CS8900_BASE, 0}; static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0}; -#include #elif defined(CONFIG_ARCH_IXDP2X01) -#include static unsigned int netcard_portlist[] __used __initdata = {IXDP2X01_CS8900_VIRT_BASE, 0}; static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0}; #elif defined(CONFIG_ARCH_PNX010X) -#include #include #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000) /* = Physical address 0x48200000 */ #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */