On 09/02/2012 11:52 AM, Thierry Reding wrote: > 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. > Where exactly did you have this problem? arch/mips/jz4740/ should not be in the include path, so "#include <irq.h>" should not cause arch/mips/jz4740/irq.h to be included. > Signed-off-by: Thierry Reding <thierry.reding@xxxxxxxxxxxxxxxxx> > --- > 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 <lars@xxxxxxxxxx> > - * > - * 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 <linux/irq.h> > - > -extern void jz4740_irq_suspend(struct irq_data *data); > -extern void jz4740_irq_resume(struct irq_data *data); > - > -#endif
