[ARM] Remove asm/arch/irq.h
asm/arch/irq.h used to be included from asm/irq.h, but was removed from the ARM kernel a long time ago. Consequently, the contents of asm/arch/irq.h (which mostly contain a definition for fixup_irq()) have not been used. Hence, remove asm/arch/irq.h. Some machine support files incorrectly included this file, making little or no use of the contents. Move the contents to a local include file, and remove those include statements as well. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
Russell King
Родитель
f80658137f
Коммит
411ef7f4cf
|
|
@ -12,5 +12,6 @@ extern struct sys_timer lh7a40x_timer;
|
|||
|
||||
extern void lh7a400_init_irq (void);
|
||||
extern void lh7a404_init_irq (void);
|
||||
extern void lh7a40x_init_board_irq (void);
|
||||
|
||||
#define IRQ_DISPATCH(irq) desc_handle_irq((irq),(irq_desc + irq), regs)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include <asm/mach/hardware.h>
|
||||
#include <asm/mach/irqs.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
/* KEV7a400 CPLD IRQ handling */
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@
|
|||
#include <asm/hardware.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/mach/irq.h>
|
||||
#include <asm/arch/irq.h>
|
||||
#include <asm/arch/irqs.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
/* CPU IRQ handling */
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,10 @@
|
|||
#include <asm/hardware.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/mach/irq.h>
|
||||
#include <asm/arch/irq.h>
|
||||
#include <asm/arch/irqs.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
#define USE_PRIORITIES
|
||||
|
||||
/* See Documentation/arm/Sharp-LH/VectoredInterruptController for more
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
#include <asm/mach/irq.h>
|
||||
#include <asm/arch/irqs.h>
|
||||
|
||||
#include "common.h"
|
||||
|
||||
static void lh7a40x_ack_cpld_irq (u32 irq)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <asm/mach/irq.h>
|
||||
|
||||
#include <asm/arch/pxa-regs.h>
|
||||
#include <asm/arch/irq.h>
|
||||
#include <asm/arch/irda.h>
|
||||
#include <asm/arch/mmc.h>
|
||||
#include <asm/arch/udc.h>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <asm/mach/irq.h>
|
||||
|
||||
#include <asm/arch/pxa-regs.h>
|
||||
#include <asm/arch/irq.h>
|
||||
#include <asm/arch/mmc.h>
|
||||
#include <asm/arch/udc.h>
|
||||
#include <asm/arch/irda.h>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
#include <asm/mach/irq.h>
|
||||
|
||||
#include <asm/arch/pxa-regs.h>
|
||||
#include <asm/arch/irq.h>
|
||||
#include <asm/arch/irda.h>
|
||||
#include <asm/arch/mmc.h>
|
||||
#include <asm/arch/ohci.h>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
#include <asm/mach/irq.h>
|
||||
|
||||
#include <asm/arch/pxa-regs.h>
|
||||
#include <asm/arch/irq.h>
|
||||
#include <asm/arch/tosa.h>
|
||||
|
||||
#include <asm/hardware/scoop.h>
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
/*
|
||||
* include/asm-arm/arch-h720x/irq.h
|
||||
*
|
||||
* Copyright (C) 2000-2002 Jungjun Kim
|
||||
* (C) 2003 Robert Schwebel <r.schwebel@pengutronix.de>
|
||||
* (C) 2003 Thomas Gleixner <tglx@linutronix.de>
|
||||
*/
|
||||
|
||||
#ifndef __ASM_ARCH_IRQ_H
|
||||
#define __ASM_ARCH_IRQ_H
|
||||
|
||||
extern void __init h720x_init_irq (void);
|
||||
|
||||
#endif /* __ASM_ARCH_IRQ_H */
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* linux/include/asm-arm/arch-imxads/irq.h
|
||||
*
|
||||
* Copyright (C) 1999 ARM Limited
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#define fixup_irq(i) (i)
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
/*
|
||||
* linux/include/asm-arm/arch-ixp2000/irq.h
|
||||
*
|
||||
* Copyright (C) 2002 Intel Corp.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#define fixup_irq(irq) (irq)
|
||||
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
/*
|
||||
* irq.h
|
||||
*
|
||||
* Copyright (C) 2002 Intel Corporation.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
*/
|
||||
|
||||
#define fixup_irq(irq) (irq)
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
/* include/asm-arm/arch-lh7a40x/irq.h
|
||||
*
|
||||
* Copyright (C) 2004 Logic Product Development
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* version 2 as published by the Free Software Foundation.
|
||||
*
|
||||
*/
|
||||
|
||||
void __init lh7a40x_init_board_irq (void);
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
/*
|
||||
* linux/include/asm-arm/arch-pxa/irq.h
|
||||
*
|
||||
* Author: Nicolas Pitre
|
||||
* Created: Jun 15, 2001
|
||||
* Copyright: MontaVista Software Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
#define fixup_irq(x) (x)
|
||||
|
||||
Загрузка…
Ссылка в новой задаче