diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 20:28:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 20:28:24 -0400 |
| commit | 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (patch) | |
| tree | e8a8be21d4eb613d65c1f6dfc125157c2568b86f /arch/arm/mach-h720x/cpu-h7201.c | |
| parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
| parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-h720x/cpu-h7201.c')
| -rw-r--r-- | arch/arm/mach-h720x/cpu-h7201.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-h720x/cpu-h7201.c b/arch/arm/mach-h720x/cpu-h7201.c index 743656881ed6..af9e4a5d5ea7 100644 --- a/arch/arm/mach-h720x/cpu-h7201.c +++ b/arch/arm/mach-h720x/cpu-h7201.c | |||
| @@ -41,8 +41,8 @@ h7201_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
| 41 | 41 | ||
| 42 | static struct irqaction h7201_timer_irq = { | 42 | static struct irqaction h7201_timer_irq = { |
| 43 | .name = "h7201 Timer Tick", | 43 | .name = "h7201 Timer Tick", |
| 44 | .flags = SA_INTERRUPT, | 44 | .flags = SA_INTERRUPT | SA_TIMER, |
| 45 | .handler = h7201_timer_interrupt | 45 | .handler = h7201_timer_interrupt, |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
| 48 | /* | 48 | /* |