diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 17:28:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 17:28:24 -0700 |
| commit | 41b6c37326cb24efc86fba94bcaa37f2cc23f1cd (patch) | |
| tree | e8a8be21d4eb613d65c1f6dfc125157c2568b86f /arch/arm/mach-omap/time.c | |
| parent | 5f6b5517bfcae217d52a7607b1bebc3a257f45d1 (diff) | |
| parent | 26799e675e47c5aa3104628e2081a7299ea46557 (diff) | |
| download | op-kernel-dev-41b6c37326cb24efc86fba94bcaa37f2cc23f1cd.zip op-kernel-dev-41b6c37326cb24efc86fba94bcaa37f2cc23f1cd.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-omap/time.c')
| -rw-r--r-- | arch/arm/mach-omap/time.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-omap/time.c b/arch/arm/mach-omap/time.c index 4205fdc..589e8b2 100644 --- a/arch/arm/mach-omap/time.c +++ b/arch/arm/mach-omap/time.c @@ -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) |
