diff options
| author | Tony Lindgren | 2012-02-28 23:27:01 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-02-28 23:27:01 +0100 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap2/emu.c | |
| parent | ARM: OMAP: McSPI: Remove unused flag from struct omap2_mcspi_device_config (diff) | |
| parent | ARM: OMAP2+: Limit omap_read/write usage to legacy USB drivers (diff) | |
| download | kernel-qcow2-linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.tar.gz kernel-qcow2-linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.tar.xz kernel-qcow2-linux-a5bee307ba7befc96a97915d6d45ffbe1e5f9a20.zip | |
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 @@ #include <linux/clk.h> #include <linux/err.h> +#include "iomap.h" + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Alexander Shishkin"); |