Merge branch 'core/percpu' into x86/core

[mv-sheeva.git] / drivers / mfd / mcp-core.c

diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c
index b4ed57e027291ae3d3dcbec83e2cd8761d3fb70c..6063dc2b52e8878d2bd60b01b7a99b632dccdb79 100644 (file)
--- a/drivers/mfd/mcp-core.c
+++ b/drivers/mfd/mcp-core.c
@@ -18,7 +18,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 
-#include <asm/dma.h>
+#include <mach/dma.h>
 #include <asm/system.h>
 
 #include "mcp.h"