diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-06-28 06:51:05 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-23 08:50:41 -0400 |
| commit | 31bd0e5e61dce5cf4b95dd9f463d7f88f2df08b4 (patch) | |
| tree | 6a3f8bff812dd55d697508546bef4229013384e9 | |
| parent | aa9c2182c45421d54ed27c2a1765f7adedce291b (diff) | |
| download | linux-31bd0e5e61dce5cf4b95dd9f463d7f88f2df08b4.tar.gz linux-31bd0e5e61dce5cf4b95dd9f463d7f88f2df08b4.tar.bz2 linux-31bd0e5e61dce5cf4b95dd9f463d7f88f2df08b4.zip | |
media: davinci-vpbe: remove obsolete includes
The driver builds fine without these, and they cause build
problems once davinci multiplatform support is enabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/platform/davinci/vpbe_display.c | 4 | ||||
| -rw-r--r-- | drivers/media/platform/davinci/vpbe_osd.c | 5 | ||||
| -rw-r--r-- | drivers/media/platform/davinci/vpbe_venc.c | 5 |
3 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 9f1417e4b744..ae419958e420 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -19,10 +19,6 @@ #include <asm/pgtable.h> -#ifdef CONFIG_ARCH_DAVINCI -#include <mach/cputype.h> -#endif - #include <media/v4l2-dev.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c index 491842ef33c5..91b571a0ac2c 100644 --- a/drivers/media/platform/davinci/vpbe_osd.c +++ b/drivers/media/platform/davinci/vpbe_osd.c @@ -16,11 +16,6 @@ #include <linux/clk.h> #include <linux/slab.h> -#ifdef CONFIG_ARCH_DAVINCI -#include <mach/cputype.h> -#include <mach/hardware.h> -#endif - #include <media/davinci/vpss.h> #include <media/v4l2-device.h> #include <media/davinci/vpbe_types.h> diff --git a/drivers/media/platform/davinci/vpbe_venc.c b/drivers/media/platform/davinci/vpbe_venc.c index 425f91f07165..8caa084e5704 100644 --- a/drivers/media/platform/davinci/vpbe_venc.c +++ b/drivers/media/platform/davinci/vpbe_venc.c @@ -14,11 +14,6 @@ #include <linux/videodev2.h> #include <linux/slab.h> -#ifdef CONFIG_ARCH_DAVINCI -#include <mach/hardware.h> -#include <mach/mux.h> -#endif - #include <linux/platform_data/i2c-davinci.h> #include <linux/io.h> |