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/dma | |
| parent | 27615a97b2dc7e98b925973b78d1cdc3ee288ab0 (diff) | |
| parent | 2b6c4e73248758bac8e1ed81b0d0664da0fff6f8 (diff) | |
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/dma')
| -rw-r--r-- | drivers/dma/omap-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 30abe7b36aaa..56d925312a5c 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -19,7 +19,7 @@ #include "virt-dma.h" -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #ifdef CONFIG_ARCH_OMAP2PLUS #define dma_omap2plus() 1 |