diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:49 -0400 |
commit | 0f2ed4c6bae23d2b7ef0ea2d272377e3de700c0c (patch) | |
tree | 94a24c9209eb97027e7035b2790a1592d4b2c40c /drivers/char/ip2/ip2main.c | |
parent | 69ab3912d1b4dbf27ea1a383cb5731251fc0e109 (diff) |
[PATCH] irq-flags: drivers/char: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/ip2/ip2main.c')
-rw-r--r-- | drivers/char/ip2/ip2main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index f9aa53c76f99..a4200a2b0811 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c | |||
@@ -491,8 +491,8 @@ static struct tty_operations ip2_ops = { | |||
491 | /* initialisation of the devices and driver structures, and registers itself */ | 491 | /* initialisation of the devices and driver structures, and registers itself */ |
492 | /* with the relevant kernel modules. */ | 492 | /* with the relevant kernel modules. */ |
493 | /******************************************************************************/ | 493 | /******************************************************************************/ |
494 | /* SA_INTERRUPT- if set blocks all interrupts else only this line */ | 494 | /* IRQF_DISABLED - if set blocks all interrupts else only this line */ |
495 | /* SA_SHIRQ - for shared irq PCI or maybe EISA only */ | 495 | /* IRQF_SHARED - for shared irq PCI or maybe EISA only */ |
496 | /* SA_RANDOM - can be source for cert. random number generators */ | 496 | /* SA_RANDOM - can be source for cert. random number generators */ |
497 | #define IP2_SA_FLAGS 0 | 497 | #define IP2_SA_FLAGS 0 |
498 | 498 | ||
@@ -753,7 +753,7 @@ retry: | |||
753 | if (have_requested_irq(ip2config.irq[i])) | 753 | if (have_requested_irq(ip2config.irq[i])) |
754 | continue; | 754 | continue; |
755 | rc = request_irq( ip2config.irq[i], ip2_interrupt, | 755 | rc = request_irq( ip2config.irq[i], ip2_interrupt, |
756 | IP2_SA_FLAGS | (ip2config.type[i] == PCI ? SA_SHIRQ : 0), | 756 | IP2_SA_FLAGS | (ip2config.type[i] == PCI ? IRQF_SHARED : 0), |
757 | pcName, (void *)&pcName); | 757 | pcName, (void *)&pcName); |
758 | if (rc) { | 758 | if (rc) { |
759 | printk(KERN_ERR "IP2: an request_irq failed: error %d\n",rc); | 759 | printk(KERN_ERR "IP2: an request_irq failed: error %d\n",rc); |