Merge branch 'iomap' into cleanup

2012-02-28 14:27:01 -08:00
parent 0aac881246 acea7c7b81
commit a5bee307ba
93 changed files with 447 additions and 273 deletions
--- a/arch/arm/mach-omap2/emu.c
+++ b/arch/arm/mach-omap2/emu.c
@@ -21,6 +21,8 @@
 #include <linux/clk.h>
 #include <linux/err.h>

+#include "iomap.h"
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Alexander Shishkin");