diff options
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/time.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index b0aaf4328732..094cc52745c5 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
@@ -718,7 +718,7 @@ int s3c2410_dma_request(unsigned int channel, s3c2410_dma_client_t *client, | |||
718 | pr_debug("dma%d: %s : requesting irq %d\n", | 718 | pr_debug("dma%d: %s : requesting irq %d\n", |
719 | channel, __FUNCTION__, chan->irq); | 719 | channel, __FUNCTION__, chan->irq); |
720 | 720 | ||
721 | err = request_irq(chan->irq, s3c2410_dma_irq, SA_INTERRUPT, | 721 | err = request_irq(chan->irq, s3c2410_dma_irq, IRQF_DISABLED, |
722 | client->name, (void *)chan); | 722 | client->name, (void *)chan); |
723 | 723 | ||
724 | if (err) { | 724 | if (err) { |
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c index c153c49c75dc..00d1cfca9712 100644 --- a/arch/arm/mach-s3c2410/time.c +++ b/arch/arm/mach-s3c2410/time.c | |||
@@ -138,7 +138,7 @@ s3c2410_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
138 | 138 | ||
139 | static struct irqaction s3c2410_timer_irq = { | 139 | static struct irqaction s3c2410_timer_irq = { |
140 | .name = "S3C2410 Timer Tick", | 140 | .name = "S3C2410 Timer Tick", |
141 | .flags = SA_INTERRUPT | SA_TIMER, | 141 | .flags = IRQF_DISABLED | IRQF_TIMER, |
142 | .handler = s3c2410_timer_interrupt, | 142 | .handler = s3c2410_timer_interrupt, |
143 | }; | 143 | }; |
144 | 144 | ||
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 495f8c6ffcb6..6b22d8f0a00d 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c | |||
@@ -85,8 +85,8 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on) | |||
85 | 85 | ||
86 | if (on) { | 86 | if (on) { |
87 | ret = request_irq(IRQ_USBOC, usb_simtec_ocirq, | 87 | ret = request_irq(IRQ_USBOC, usb_simtec_ocirq, |
88 | SA_INTERRUPT | SA_TRIGGER_RISING | | 88 | IRQF_DISABLED | IRQF_TRIGGER_RISING | |
89 | SA_TRIGGER_FALLING, | 89 | IRQF_TRIGGER_FALLING, |
90 | "USB Over-current", info); | 90 | "USB Over-current", info); |
91 | if (ret != 0) { | 91 | if (ret != 0) { |
92 | printk(KERN_ERR "failed to request usb oc irq\n"); | 92 | printk(KERN_ERR "failed to request usb oc irq\n"); |