2 files changed, 19 insertions, 13 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a67d617429c..5a1f0319add 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -156,7 +156,7 @@ Who:	Greg Kroah-Hartman <gregkh@suse.de>
 ---------------------------
 
 What:   Interrupt only SA_* flags
-When:   Januar 2007
+When:   September 2007
 Why:    The interrupt related SA_* flags are replaced by IRQF_* to move them
         out of the signal namespace.
 
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 2067a7ef6e6..80e63d8e9b1 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -54,20 +54,26 @@
 #define IRQF_NOBALANCING        0x00000800
 
 /*
- * Migration helpers. Scheduled for removal in 1/2007
+ * Migration helpers. Scheduled for removal in 9/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
+static inline
+unsigned long __deprecated deprecated_irq_flag(unsigned long flag)
+{
+        return flag;
+}
+
+#define SA_INTERRUPT            deprecated_irq_flag(IRQF_DISABLED)
+#define SA_SAMPLE_RANDOM        deprecated_irq_flag(IRQF_SAMPLE_RANDOM)
+#define SA_SHIRQ                deprecated_irq_flag(IRQF_SHARED)
+#define SA_PROBEIRQ             deprecated_irq_flag(IRQF_PROBE_SHARED)
+#define SA_PERCPU               deprecated_irq_flag(IRQF_PERCPU)
+
+#define SA_TRIGGER_LOW          deprecated_irq_flag(IRQF_TRIGGER_LOW)
+#define SA_TRIGGER_HIGH         deprecated_irq_flag(IRQF_TRIGGER_HIGH)
+#define SA_TRIGGER_FALLING      deprecated_irq_flag(IRQF_TRIGGER_FALLING)
+#define SA_TRIGGER_RISING       deprecated_irq_flag(IRQF_TRIGGER_RISING)
+#define SA_TRIGGER_MASK         deprecated_irq_flag(IRQF_TRIGGER_MASK)
 
 typedef irqreturn_t (*irq_handler_t)(int, void *);