1 files changed, 6 insertions, 6 deletions

diff --git a/arch/frv/kernel/irq.c b/arch/frv/kernel/irq.c
index 5920f52bf9c8..08967010be04 100644
--- a/arch/frv/kernel/irq.c
+++ b/arch/frv/kernel/irq.c
@@ -341,11 +341,11 @@ asmlinkage void do_NMI(void)
  *
  *      Flags:
  *
- *      SA_SHIRQ                Interrupt is shared
+ *      IRQF_SHARED             Interrupt is shared
  *
- *      SA_INTERRUPT            Disable local interrupts while processing
+ *      IRQF_DISABLED   Disable local interrupts while processing
  *
- *      SA_SAMPLE_RANDOM        The interrupt can be used for entropy
+ *      IRQF_SAMPLE_RANDOM      The interrupt can be used for entropy
  *
  */
 
@@ -365,7 +365,7 @@ int request_irq(unsigned int irq,
          * to figure out which interrupt is which (messes up the
          * interrupt freeing logic etc).
          */
-        if (irqflags & SA_SHIRQ) {
+        if (irqflags & IRQF_SHARED) {
                 if (!dev_id)
                         printk("Bad boy: %s (at 0x%x) called us without a dev_id!\n",
                                devname, (&irq)[-1]);
@@ -576,7 +576,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
          * so we have to be careful not to interfere with a
          * running system.
          */
-        if (new->flags & SA_SAMPLE_RANDOM) {
+        if (new->flags & IRQF_SAMPLE_RANDOM) {
                 /*
                  * This function might sleep, we want to call it first,
                  * outside of the atomic block.
@@ -592,7 +592,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
         spin_lock_irqsave(&level->lock, flags);
 
         /* can't share interrupts unless all parties agree to */
-        if (level->usage != 0 && !(level->flags & new->flags & SA_SHIRQ)) {
+        if (level->usage != 0 && !(level->flags & new->flags & IRQF_SHARED)) {
                 spin_unlock_irqrestore(&level->lock,flags);
                 return -EBUSY;
         }