diff --git a/[refs] b/[refs]
index 15cd4aefc9ba..0a6e608dcd89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 759a3f3f3171c521229dda2335e5ab105f6fdc40
+refs/heads/master: 709465d6ea0466454ef547e7d1065db2b23033a9
diff --git a/trunk/drivers/net/irda/bfin_sir.h b/trunk/drivers/net/irda/bfin_sir.h
index b54a6f08db45..1d33564029a4 100644
--- a/trunk/drivers/net/irda/bfin_sir.h
+++ b/trunk/drivers/net/irda/bfin_sir.h
@@ -26,6 +26,11 @@
 #include <asm/cacheflush.h>
 #include <asm/dma.h>
 #include <asm/portmux.h>
+/* Some transitional glue */
+#include <linux/serial_core.h>
+#include <linux/circ_buf.h>
+#include <mach/bfin_serial_5xx.h>
+#undef DRIVER_NAME
 
 #ifdef CONFIG_SIR_BFIN_DMA
 struct dma_rx_buf {