diff --git a/[refs] b/[refs]
index 65145a3b7395..a4c26d079524 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb53b4e8fef10ccccb49a6dbb5e19ca84ba5a305
+refs/heads/master: 3dd3d46b78c22503957230ca5981849b7bb29b9a
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index 737eafbc1f3d..7c07a09931db 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -226,7 +226,6 @@ irq_remap_to_desc(unsigned int irq, struct irq_desc *desc)
  * Migration helpers for obsolete names, they will go away:
  */
 #define hw_interrupt_type	irq_chip
-typedef struct irq_chip		hw_irq_controller;
 #define no_irq_type		no_irq_chip
 typedef struct irq_desc		irq_desc_t;