From 7dea19b93950ddedfec96519e5b3bf348c96ed5b Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 1 Aug 2011 10:55:53 -0400
Subject: [PATCH] --- yaml --- r: 274437 b: refs/heads/master c:
 12799fe45254b66975481da826fc510685e206eb h: refs/heads/master i:   274435:
 84928dccb2cfe84a121e83c6b7229f04ede774e4 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/m68k/atari/time.c    | 1 +
 trunk/arch/m68k/kernel/dma_mm.c | 1 +
 trunk/arch/m68k/kernel/dma_no.c | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 687a5e3346ee..6cc2a30b56e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd3ff1943509e641a34f2d8dd1d41ed12a4476c1
+refs/heads/master: 12799fe45254b66975481da826fc510685e206eb
diff --git a/trunk/arch/m68k/atari/time.c b/trunk/arch/m68k/atari/time.c
index a0531f34c617..c0cc68a2c829 100644
--- a/trunk/arch/m68k/atari/time.c
+++ b/trunk/arch/m68k/atari/time.c
@@ -17,6 +17,7 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 
 #include <asm/atariints.h>
 
diff --git a/trunk/arch/m68k/kernel/dma_mm.c b/trunk/arch/m68k/kernel/dma_mm.c
index 4bbb3c2a8880..a3c471b523f2 100644
--- a/trunk/arch/m68k/kernel/dma_mm.c
+++ b/trunk/arch/m68k/kernel/dma_mm.c
@@ -12,6 +12,7 @@
 #include <linux/scatterlist.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/export.h>
 
 #include <asm/pgalloc.h>
 
diff --git a/trunk/arch/m68k/kernel/dma_no.c b/trunk/arch/m68k/kernel/dma_no.c
index fc61541aeb71..f1dc3fc71bc2 100644
--- a/trunk/arch/m68k/kernel/dma_no.c
+++ b/trunk/arch/m68k/kernel/dma_no.c
@@ -10,6 +10,7 @@
 #include <linux/mm.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
+#include <linux/export.h>
 #include <asm/cacheflush.h>
 
 void *dma_alloc_coherent(struct device *dev, size_t size,