diff mbox series

[v2,2/5] media: davinci-vpbe: remove obsolete includes

Message ID 20190725131257.6142-3-brgl@bgdev.pl
State New
Headers show
Series [v2,1/5] staging: media/davinci_vpfe: fix pinmux setup compilation | expand

Commit Message

Bartosz Golaszewski July 25, 2019, 1:12 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>


The driver builds fine without these.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

---
 drivers/media/platform/davinci/vpbe_display.c | 4 ----
 drivers/media/platform/davinci/vpbe_osd.c     | 5 -----
 drivers/media/platform/davinci/vpbe_venc.c    | 5 -----
 3 files changed, 14 deletions(-)

-- 
2.21.0

Comments

Arnd Bergmann July 25, 2019, 2:46 p.m. UTC | #1 
On Thu, Jul 25, 2019 at 3:13 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>

> From: Arnd Bergmann <arnd@arndb.de>

>

> The driver builds fine without these.

>

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>


This patch got merged into the linux-media tree earlier this week.
diff mbox series

Patch

diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 000b191c42d8..18f9408013d1 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>