Date:2012-09-02 11:52:28 (8 years 2 months ago)
Author:Thierry Reding
Commit:0f1f312c8c0fc34cb046b29f32de318d5aabfb3f
Message:MIPS: JZ4740: Break circular header dependency

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 <thierry.reding@avionic-design.de>
Files: arch/mips/include/asm/mach-jz4740/irq.h (1 diff)
arch/mips/jz4740/irq.h (1 diff)

Change Details

arch/mips/include/asm/mach-jz4740/irq.h
5454
5555#define NR_IRQS (JZ4740_IRQ_ADC_BASE + 6)
5656
57struct irq_data;
58
59extern void jz4740_irq_suspend(struct irq_data *data);
60extern void jz4740_irq_resume(struct irq_data *data);
61
5762#endif
arch/mips/jz4740/irq.h
1/*
2 * Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
3 *
4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms of the GNU General Public License as published by the
6 * Free Software Foundation; either version 2 of the License, or (at your
7 * option) any later version.
8 *
9 * You should have received a copy of the GNU General Public License along
10 * with this program; if not, write to the Free Software Foundation, Inc.,
11 * 675 Mass Ave, Cambridge, MA 02139, USA.
12 *
13 */
14
15#ifndef __MIPS_JZ4740_IRQ_H__
16#define __MIPS_JZ4740_IRQ_H__
17
18#include <linux/irq.h>
19
20extern void jz4740_irq_suspend(struct irq_data *data);
21extern void jz4740_irq_resume(struct irq_data *data);
22
23#endif

Archive Download the corresponding diff file



interactive