diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 17:27:01 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 17:27:01 -0500 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap2/emu.c | |
| parent | 0aac881246fb25d017617cd7be68e93326d51ce1 (diff) | |
| parent | acea7c7b81e8f67513aebade8cb99c7789c44d8c (diff) | |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/emu.c')
| -rw-r--r-- | arch/arm/mach-omap2/emu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c index ce91aad4cdad..7c9beba51a11 100644 --- a/arch/arm/mach-omap2/emu.c +++ b/arch/arm/mach-omap2/emu.c | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| 23 | 23 | ||
| 24 | #include "iomap.h" | ||
| 25 | |||
| 24 | MODULE_LICENSE("GPL"); | 26 | MODULE_LICENSE("GPL"); |
| 25 | MODULE_AUTHOR("Alexander Shishkin"); | 27 | MODULE_AUTHOR("Alexander Shishkin"); |
| 26 | 28 | ||