Merge branch 'fix/misc' into for-linus

[mv-sheeva.git] / drivers / mfd / ucb1x00-assabet.c

diff --git a/drivers/mfd/ucb1x00-assabet.c b/drivers/mfd/ucb1x00-assabet.c
index 61aeaf79640dc7d9632b8fe15c73aaea4b71dc22..86fed4870f933bed1d8682d10556e12503c5265e 100644 (file)
--- a/drivers/mfd/ucb1x00-assabet.c
+++ b/drivers/mfd/ucb1x00-assabet.c
@@ -15,7 +15,7 @@
 #include <linux/proc_fs.h>
 #include <linux/device.h>
 
-#include <asm/dma.h>
+#include <mach/dma.h>
 
 #include "ucb1x00.h"