Building comedi on 2.6.20-rt8

In 2.6.20, include/linux/interrupt.h says:

/*
  * Migration helpers. Scheduled for removal in 1/2007
  * Do not use for new code !
  */
#define SA_INTERRUPT            IRQF_DISABLED
#define SA_SAMPLE_RANDOM        IRQF_SAMPLE_RANDOM
#define SA_SHIRQ                IRQF_SHARED
#define SA_PROBEIRQ             IRQF_PROBE_SHARED
#define SA_PERCPU               IRQF_PERCPU

#define SA_TRIGGER_LOW          IRQF_TRIGGER_LOW
#define SA_TRIGGER_HIGH         IRQF_TRIGGER_HIGH
#define SA_TRIGGER_FALLING      IRQF_TRIGGER_FALLING
#define SA_TRIGGER_RISING       IRQF_TRIGGER_RISING
#define SA_TRIGGER_MASK         IRQF_TRIGGER_MASK

Hence in 2.6.20-rt8 Ingo quite correctly removed these, should a patch against 
the current CVS head be made at this point, and if so should it be:

   1. Change all occurences of of SA_SHIRQ to IRQF_SHARED and put an
      #ifndef IRQF_SHARED
      #define IRQF_SHARED SA_SHIRQ
      #endif
      in the comedi/include/linux/interrupt.h

   2. Or should I just put a
      #ifndef SA_SHIRQ
      #define SA_SHIRQ IRQF_SHARED
      #endif
      in the comedi/include/linux/interrupt.h


Anders
-- 
Anders Blomdell                  Email: anders.blomdell_at_control.lth.se
Department of Automatic Control
Lund University                  Phone:    +46 46 222 4625
P.O. Box 118                     Fax:      +46 46 138118
SE-221 00 Lund, Sweden

Received on 2007-02-16Z16:48:55