summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-11-30 10:27:22 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-11-30 10:27:22 +1100
commitdbf0f84d70e02b814daf2f8fc5accf1676d9687b (patch)
treedf7ecc0394b7a4521e54ddaa2f0da82feaeea447 /drivers
parent6555578b4e3ba959ec2c583f38c0cc2e470f9b9b (diff)
parent4939c1a1e052291e6df220c0c68d452fd5e6a87f (diff)
Merge remote branch 'blackfin/for-linus'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/irda/bfin_sir.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/irda/bfin_sir.h b/drivers/net/irda/bfin_sir.h
index b54a6f08db45..e3b285a67734 100644
--- a/drivers/net/irda/bfin_sir.h
+++ b/drivers/net/irda/bfin_sir.h
@@ -26,6 +26,8 @@
#include <asm/cacheflush.h>
#include <asm/dma.h>
#include <asm/portmux.h>
+#include <mach/bfin_serial_5xx.h>
+#undef DRIVER_NAME
#ifdef CONFIG_SIR_BFIN_DMA
struct dma_rx_buf {