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/video/omap | |
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/video/omap')
-rw-r--r-- | drivers/video/omap/lcdc.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/omapfb_main.c | 2 | ||||
-rw-r--r-- | drivers/video/omap/sossi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 7767338f8b1..c39d6e46f8c 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c @@ -31,7 +31,7 @@ #include <linux/gfp.h> #include <mach/lcdc.h> -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #include <asm/mach-types.h> diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 4351c438b76..1b5ee8ec192 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -30,7 +30,7 @@ #include <linux/uaccess.h> #include <linux/module.h> -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #include "omapfb.h" #include "lcdc.h" diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index f79c137753d..c510a445739 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c @@ -25,7 +25,7 @@ #include <linux/io.h> #include <linux/interrupt.h> -#include <plat/dma.h> +#include <plat-omap/dma-omap.h> #include "omapfb.h" #include "lcdc.h" |