2 files changed, 18 insertions, 0 deletions

diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl
index 3a882d9a90a9..c671a0168096 100644
--- a/Documentation/DocBook/genericirq.tmpl
+++ b/Documentation/DocBook/genericirq.tmpl
@@ -440,6 +440,7 @@ desc->chip->end();
      used in the generic IRQ layer.
      </para>
 !Iinclude/linux/irq.h
+!Iinclude/linux/interrupt.h
   </chapter>
 
   <chapter id="pubfunctions">
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 20d3b94703a4..9aa1dda5d38c 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -344,3 +344,20 @@ Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
         Removal is subject to fixing any remaining bugs in ACPI which may
         cause the thermal throttling not to happen at the right time.
 Who:    Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>
+
+-----------------------------
+
+What:   __do_IRQ all in one fits nothing interrupt handler
+When:   2.6.32
+Why:    __do_IRQ was kept for easy migration to the type flow handlers.
+        More than two years of migration time is enough.
+Who:    Thomas Gleixner <tglx@linutronix.de>
+
+-----------------------------
+
+What:   obsolete generic irq defines and typedefs
+When:   2.6.30
+Why:    The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t)
+        have been kept around for migration reasons. After more than two years
+        it's time to remove them finally
+Who:    Thomas Gleixner <tglx@linutronix.de>