Merge tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...

[pandora-kernel.git] / include / linux / mfd / davinci_voicecodec.h

diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h
index 810aee7..13a1ee9 100644 (file)
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@ -26,8 +26,8 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
+#include <linux/platform_data/edma.h>
 
-#include <mach/edma.h>
 #include <mach/hardware.h>
 
 /*