diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 10:01:30 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 10:01:30 -0700 |
| commit | 94c657853bd228ebbc2c590b7f81efcc1dde3329 (patch) | |
| tree | 4fb0a566594ed2bbbf1dd2076806335a29c1e2cc /drivers/crypto | |
| parent | 27615a97b2dc7e98b925973b78d1cdc3ee288ab0 (diff) | |
| parent | 2b6c4e73248758bac8e1ed81b0d0664da0fff6f8 (diff) | |
| download | op-kernel-dev-94c657853bd228ebbc2c590b7f81efcc1dde3329.zip op-kernel-dev-94c657853bd228ebbc2c590b7f81efcc1dde3329.tar.gz | |
Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers
Conflicts:
drivers/crypto/omap-aes.c
drivers/crypto/omap-sham.c
drivers/dma/omap-dma.c
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/omap-aes.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/omap-sham.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index db3115d..649a146 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -29,7 +29,7 @@ #include <crypto/scatterwalk.h> #include <crypto/aes.h> -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> /* OMAP TRM gives bitfields as start:end, where start is the higher bit number. For example 7:0 */ diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index f50387c..d76fe06 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -37,7 +37,7 @@ #include <crypto/hash.h> #include <crypto/internal/hash.h> -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #include <mach/irqs.h> #define SHA_REG_DIGEST(x) (0x00 + ((x) * 0x04)) |
