diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-02-08 06:40:11 -0500 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-02-15 18:43:45 -0500 |
| commit | 4531dab4294435d6f57ecd942831a79bab303287 (patch) | |
| tree | 744af61e0bd2fa7b22d4d41294046a4cc85d14a9 | |
| parent | bc0c36d3c831b5f33ca0dab39535f5deb8c55b62 (diff) | |
m68knommu: remove use of IRQ_FLG_LOCK from 68360 platform support
The m68knommu arch does not define or use IRQ_FLG_LOCK in its irq
subsystem. Remove obsolete use of it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68knommu/platform/68360/commproc.c | 2 | ||||
| -rw-r--r-- | arch/m68knommu/platform/68360/config.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68knommu/platform/68360/commproc.c b/arch/m68knommu/platform/68360/commproc.c index f27e688c404e..8e4e10cc0080 100644 --- a/arch/m68knommu/platform/68360/commproc.c +++ b/arch/m68knommu/platform/68360/commproc.c | |||
| @@ -210,7 +210,7 @@ void | |||
| 210 | cpm_install_handler(int vec, void (*handler)(), void *dev_id) | 210 | cpm_install_handler(int vec, void (*handler)(), void *dev_id) |
| 211 | { | 211 | { |
| 212 | 212 | ||
| 213 | request_irq(vec, handler, IRQ_FLG_LOCK, "timer", dev_id); | 213 | request_irq(vec, handler, 0, "timer", dev_id); |
| 214 | 214 | ||
| 215 | /* if (cpm_vecs[vec].handler != 0) */ | 215 | /* if (cpm_vecs[vec].handler != 0) */ |
| 216 | /* printk(KERN_INFO "CPM interrupt %x replacing %x\n", */ | 216 | /* printk(KERN_INFO "CPM interrupt %x replacing %x\n", */ |
diff --git a/arch/m68knommu/platform/68360/config.c b/arch/m68knommu/platform/68360/config.c index ac629fa30099..9dd5bca38749 100644 --- a/arch/m68knommu/platform/68360/config.c +++ b/arch/m68knommu/platform/68360/config.c | |||
| @@ -75,7 +75,7 @@ void hw_timer_init(void) | |||
| 75 | /* Set compare register 32Khz / 32 / 10 = 100 */ | 75 | /* Set compare register 32Khz / 32 / 10 = 100 */ |
| 76 | TCMP = 10; | 76 | TCMP = 10; |
| 77 | 77 | ||
| 78 | request_irq(IRQ_MACHSPEC | 1, timer_routine, IRQ_FLG_LOCK, "timer", NULL); | 78 | request_irq(IRQ_MACHSPEC | 1, timer_routine, 0, "timer", NULL); |
| 79 | #endif | 79 | #endif |
| 80 | 80 | ||
| 81 | /* General purpose quicc timers: MC68360UM p7-20 */ | 81 | /* General purpose quicc timers: MC68360UM p7-20 */ |
