From 4f86d0e12940b1fd19acdfac675744c747471093 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 28 Oct 2010 15:43:50 -0400
Subject: [PATCH] --- yaml --- r: 228415 b: refs/heads/master c:
 709465d6ea0466454ef547e7d1065db2b23033a9 h: refs/heads/master i:   228413:
 66f4e4879f775dc308e2f687f05f9978cd4074f9   228411:
 12f69184729c1bb3ae181c6ae55fed3e5e5b67bc   228407:
 100731f24824c06ead74c4b2d06d24b2f8a6ec0d   228399:
 19339eb66f1579d3d89c9c676126909031d46bf9   228383:
 ac366182a383ae9ef6bbb0fa4915506338fadce2   228351:
 89afbffab92f4e63674e117fecc1c12bba3127fd v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/net/irda/bfin_sir.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 {