diff --git a/[refs] b/[refs]
index 18504c657794..97737fb86585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1524e29e318e79b2d04bcbd651a7af8dff32bb3
+refs/heads/master: 21aa8ec362b59458bea1144494ae53ca2d8b13ed
diff --git a/trunk/drivers/net/irda/bfin_sir.h b/trunk/drivers/net/irda/bfin_sir.h
index 1d33564029a4..e3b285a67734 100644
--- a/trunk/drivers/net/irda/bfin_sir.h
+++ b/trunk/drivers/net/irda/bfin_sir.h
@@ -26,9 +26,6 @@
 #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