From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756020Ab2IBJxu (ORCPT ); Sun, 2 Sep 2012 05:53:50 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:63879 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755963Ab2IBJwq (ORCPT ); Sun, 2 Sep 2012 05:52:46 -0400 From: Thierry Reding To: Ralf Baechle Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Antony Pavlov , Lars-Peter Clausen , Maarten ter Huurne Subject: [PATCH 1/3] MIPS: JZ4740: Break circular header dependency Date: Sun, 2 Sep 2012 11:52:28 +0200 Message-Id: <1346579550-5990-2-git-send-email-thierry.reding@avionic-design.de> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1346579550-5990-1-git-send-email-thierry.reding@avionic-design.de> References: <1346579550-5990-1-git-send-email-thierry.reding@avionic-design.de> X-Provags-ID: V02:K0:vBTpCUbdjb+f0tX8mbylDajFjasL5SP7lFS8D7fTp8A xkkgOQ4NkkdLi8RuGGLR6YMji/Q1OUQSR18/SJYAq5K4TB+WUR FuxTDs6Hq3/AplT9DS0o+hx5oCwcRyQumyYmn52pQdGesOjaUM 6fsYDpQRSRYFhm84p7C0x3DMWBm6DxeWmdtdbG+GWLeEHGf8sI IqrwE9AVrbFxIuv38JDM1+YW3euR5q7kCWrWgYzqQznZDPzQ3E WLWv/9AEBOURjrvdr+PY3BKogyxnjIiBPqVDz50mwOlFDcvkKU gPzCHCqU0rExQCwACgeyPYcQDbfT+LhEyaM3/Vjn8+wth0bEqO a7RG4EJbhNf/MuIfNg8zzRO3S3XtotnYMfPK1fFU0UjP5MORMi FdxXEq9WSJqjCAWZlNb7wWYnmoSoRbKPf6/5vvJXfCU7IQUBm+ YLAM8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When including irq.h, arch/mips/jz4740/irq.h will be selected as the first candidate. This header does not include the proper definitions (most notably NR_IRQS) required by subsequent headers. To solve this arch/mips/jz4740/irq.h can be deleted and its contents can be moved into arch/mips/include/asm/mach-jz4740/irq.h, which will then be correctly included. Signed-off-by: Thierry Reding --- arch/mips/include/asm/mach-jz4740/irq.h | 5 +++++ arch/mips/jz4740/irq.h | 23 ----------------------- 2 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 arch/mips/jz4740/irq.h diff --git a/arch/mips/include/asm/mach-jz4740/irq.h b/arch/mips/include/asm/mach-jz4740/irq.h index 5ad1a9c..aa6fd90 100644 --- a/arch/mips/include/asm/mach-jz4740/irq.h +++ b/arch/mips/include/asm/mach-jz4740/irq.h @@ -54,4 +54,9 @@ #define NR_IRQS (JZ4740_IRQ_ADC_BASE + 6) +struct irq_data; + +extern void jz4740_irq_suspend(struct irq_data *data); +extern void jz4740_irq_resume(struct irq_data *data); + #endif diff --git a/arch/mips/jz4740/irq.h b/arch/mips/jz4740/irq.h deleted file mode 100644 index f75e39d..0000000 --- a/arch/mips/jz4740/irq.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2010, Lars-Peter Clausen - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __MIPS_JZ4740_IRQ_H__ -#define __MIPS_JZ4740_IRQ_H__ - -#include - -extern void jz4740_irq_suspend(struct irq_data *data); -extern void jz4740_irq_resume(struct irq_data *data); - -#endif -- 1.7.12