diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /arch/arm/mach-h720x/cpu-h7202.c | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'arch/arm/mach-h720x/cpu-h7202.c')
| -rw-r--r-- | arch/arm/mach-h720x/cpu-h7202.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c index 21b8fb6122cd..593b6a2a30e1 100644 --- a/arch/arm/mach-h720x/cpu-h7202.c +++ b/arch/arm/mach-h720x/cpu-h7202.c | |||
| @@ -171,8 +171,8 @@ static struct irqchip h7202_timerx_chip = { | |||
| 171 | 171 | ||
| 172 | static struct irqaction h7202_timer_irq = { | 172 | static struct irqaction h7202_timer_irq = { |
| 173 | .name = "h7202 Timer Tick", | 173 | .name = "h7202 Timer Tick", |
| 174 | .flags = SA_INTERRUPT, | 174 | .flags = SA_INTERRUPT | SA_TIMER, |
| 175 | .handler = h7202_timer_interrupt | 175 | .handler = h7202_timer_interrupt, |
| 176 | }; | 176 | }; |
| 177 | 177 | ||
| 178 | /* | 178 | /* |