From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 28 Oct 2010 19:43:50 +0000 (-0400)
Subject: net/irda: bfin_sir: pull in serial headers for defines
X-Git-Tag: Ubuntu-5.0.0-8.9~20696^2~49
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=709465d6ea0466454ef547e7d1065db2b23033a9;p=mirror_ubuntu-disco-kernel.git

net/irda: bfin_sir: pull in serial headers for defines

We're in the process of cleaning up the global Blackfin namespace, so the
bfin_sir driver needs to pull in the serial header explicitly now.

This does add a little transitional cruft to keep things compiling, but a
follow up patch in this series will cull that.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/drivers/net/irda/bfin_sir.h b/drivers/net/irda/bfin_sir.h
index b54a6f08db45..1d33564029a4 100644
--- a/drivers/net/irda/bfin_sir.h
+++ b/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 {