armbian/linux
0
0
Fork 0
mirror of https://github.com/armbian/linux.git synced 2026-01-06 10:13:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-arm

Browse Source
This commit is contained in:
Linus Torvalds
2005-06-26 17:28:24 -07:00
parent 5f6b5517bf 26799e675e
commit 41b6c37326
28 changed files with 73 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-aaec2000/core.c
View File

@@ -128,8 +128,8 @@ aaec2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction aaec2000_timer_irq = {
.name = "AAEC-2000 Timer Tick",
.flags = SA_INTERRUPT,
.handler = aaec2000_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = aaec2000_timer_interrupt,
};
static void __init aaec2000_timer_init(void)

4
arch/arm/mach-clps711x/time.c
View File

@@ -57,8 +57,8 @@ p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction clps711x_timer_irq = {
.name = "CLPS711x Timer Tick",
.flags = SA_INTERRUPT,
.handler = p720t_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = p720t_timer_interrupt,
};
static void __init clps711x_timer_init(void)

4
arch/arm/mach-clps7500/core.c
View File

@@ -298,8 +298,8 @@ clps7500_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction clps7500_timer_irq = {
.name = "CLPS7500 Timer Tick",
.flags = SA_INTERRUPT,
.handler = clps7500_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = clps7500_timer_interrupt,
};
/*

4
arch/arm/mach-ebsa110/core.c
View File

@@ -173,8 +173,8 @@ ebsa110_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction ebsa110_timer_irq = {
.name = "EBSA110 Timer Tick",
.flags = SA_INTERRUPT,
.handler = ebsa110_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = ebsa110_timer_interrupt,
};
/*

4
arch/arm/mach-epxa10db/time.c
View File

@@ -56,8 +56,8 @@ epxa10db_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction epxa10db_timer_irq = {
.name = "Excalibur Timer Tick",
.flags = SA_INTERRUPT,
.handler = epxa10db_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = epxa10db_timer_interrupt,
};
/*

2
arch/arm/mach-footbridge/dc21285-timer.c
View File

@@ -43,7 +43,7 @@ timer1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction footbridge_timer_irq = {
.name = "Timer1 timer tick",
.handler = timer1_interrupt,
.flags = SA_INTERRUPT,
.flags = SA_INTERRUPT | SA_TIMER,
};
/*

2
arch/arm/mach-footbridge/isa-timer.c
View File

@@ -72,7 +72,7 @@ isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction isa_timer_irq = {
.name = "ISA timer tick",
.handler = isa_timer_interrupt,
.flags = SA_INTERRUPT,
.flags = SA_INTERRUPT | SA_TIMER,
};
static void __init isa_timer_init(void)

4
arch/arm/mach-h720x/cpu-h7201.c
View File

@@ -41,8 +41,8 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction h7201_timer_irq = {
.name = "h7201 Timer Tick",
.flags = SA_INTERRUPT,
.handler = h7201_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = h7201_timer_interrupt,
};
/*

4
arch/arm/mach-h720x/cpu-h7202.c
View File

@@ -171,8 +171,8 @@ static struct irqchip h7202_timerx_chip = {
static struct irqaction h7202_timer_irq = {
.name = "h7202 Timer Tick",
.flags = SA_INTERRUPT,
.handler = h7202_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = h7202_timer_interrupt,
};
/*

4
arch/arm/mach-imx/time.c
View File

@@ -72,8 +72,8 @@ imx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction imx_timer_irq = {
.name = "i.MX Timer Tick",
.flags = SA_INTERRUPT,
.handler = imx_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = imx_timer_interrupt,
};
/*

4
arch/arm/mach-integrator/core.c
View File

@@ -247,8 +247,8 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction integrator_timer_irq = {
.name = "Integrator Timer Tick",
.flags = SA_INTERRUPT,
.handler = integrator_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = integrator_timer_interrupt,
};
/*

2
arch/arm/mach-iop3xx/iop321-time.c
View File

@@ -86,7 +86,7 @@ iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction iop321_timer_irq = {
.name = "IOP321 Timer Tick",
.handler = iop321_timer_interrupt,
.flags = SA_INTERRUPT
.flags = SA_INTERRUPT | SA_TIMER,
};
static void __init iop321_timer_init(void)

2
arch/arm/mach-iop3xx/iop331-time.c
View File

@@ -83,7 +83,7 @@ iop331_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction iop331_timer_irq = {
.name = "IOP331 Timer Tick",
.handler = iop331_timer_interrupt,
.flags = SA_INTERRUPT
.flags = SA_INTERRUPT | SA_TIMER,
};
static void __init iop331_timer_init(void)

9
arch/arm/mach-ixp2000/core.c
View File

@@ -102,6 +102,11 @@ static struct map_desc ixp2000_io_desc[] __initdata = {
.physical = IXP2000_PCI_CSR_PHYS_BASE,
.length = IXP2000_PCI_CSR_SIZE,
.type = MT_DEVICE
}, {
.virtual = IXP2000_MSF_VIRT_BASE,
.physical = IXP2000_MSF_PHYS_BASE,
.length = IXP2000_MSF_SIZE,
.type = MT_DEVICE
}, {
.virtual = IXP2000_PCI_IO_VIRT_BASE,
.physical = IXP2000_PCI_IO_PHYS_BASE,
@@ -194,8 +199,8 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction ixp2000_timer_irq = {
.name = "IXP2000 Timer Tick",
.flags = SA_INTERRUPT,
.handler = ixp2000_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = ixp2000_timer_interrupt,
};
void __init ixp2000_init_time(unsigned long tick_rate)

6
arch/arm/mach-ixp2000/ixdp2800.c
View File

@@ -42,12 +42,6 @@
#include <asm/mach/flash.h>
#include <asm/mach/arch.h>
void ixdp2400_init_irq(void)
{
ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2400_NR_IRQS);
}
/*************************************************************************
* IXDP2800 timer tick
*************************************************************************/

4
arch/arm/mach-ixp4xx/common.c
View File

@@ -298,8 +298,8 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs
static struct irqaction ixp4xx_timer_irq = {
.name = "IXP4xx Timer Tick",
.flags = SA_INTERRUPT,
.handler = ixp4xx_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = ixp4xx_timer_interrupt,
};
static void __init ixp4xx_timer_init(void)

4
arch/arm/mach-lh7a40x/time.c
View File

@@ -53,8 +53,8 @@ lh7a40x_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction lh7a40x_timer_irq = {
.name = "LHA740x Timer Tick",
.flags = SA_INTERRUPT,
.handler = lh7a40x_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = lh7a40x_timer_interrupt,
};
static void __init lh7a40x_timer_init(void)

10
arch/arm/mach-omap/time.c
View File

@@ -188,8 +188,8 @@ static irqreturn_t omap_mpu_timer_interrupt(int irq, void *dev_id,
static struct irqaction omap_mpu_timer_irq = {
.name = "mpu timer",
.flags = SA_INTERRUPT,
.handler = omap_mpu_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = omap_mpu_timer_interrupt,
};
static unsigned long omap_mpu_timer1_overflows;
@@ -203,7 +203,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id,
static struct irqaction omap_mpu_timer1_irq = {
.name = "mpu timer1 overflow",
.flags = SA_INTERRUPT,
.handler = omap_mpu_timer1_interrupt
.handler = omap_mpu_timer1_interrupt,
};
static __init void omap_init_mpu_timer(void)
@@ -349,8 +349,8 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id,
static struct irqaction omap_32k_timer_irq = {
.name = "32KHz timer",
.flags = SA_INTERRUPT,
.handler = omap_32k_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = omap_32k_timer_interrupt,
};
static __init void omap_init_32k_timer(void)

4
arch/arm/mach-pxa/time.c
View File

@@ -105,8 +105,8 @@ pxa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction pxa_timer_irq = {
.name = "PXA Timer Tick",
.flags = SA_INTERRUPT,
.handler = pxa_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = pxa_timer_interrupt,
};
static void __init pxa_timer_init(void)

4
arch/arm/mach-s3c2410/time.c
View File

@@ -137,8 +137,8 @@ s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction s3c2410_timer_irq = {
.name = "S3C2410 Timer Tick",
.flags = SA_INTERRUPT,
.handler = s3c2410_timer_interrupt
.flags = SA_INTERRUPT | SA_TIMER,
.handler = s3c2410_timer_interrupt,
};
/*

Some files were not shown because too many files have changed in this diff Show More