diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 09:21:26 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 09:21:26 +0200 |
| commit | b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5 (patch) | |
| tree | 518ec8f4bfd316e91bcc30f434edb78529557eba /arch/arm/mach-omap2/cminst44xx.c | |
| parent | crypto: ux500 - Add driver for HASH hardware (diff) | |
| parent | Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| download | linux-b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5.tar.xz linux-b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to add prerequisite for ARM ux500 crypto support.
Diffstat (limited to 'arch/arm/mach-omap2/cminst44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/cminst44xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index 6204deaf85b1..bd8810c3753f 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -20,8 +20,8 @@ #include <linux/err.h> #include <linux/io.h> +#include "iomap.h" #include "common.h" - #include "cm.h" #include "cm1_44xx.h" #include "cm2_44xx.h" |