| Message ID | 20190628105131.3130257-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 31bd0e5e61dce5cf4b95dd9f463d7f88f2df08b4 |
| Headers | show |
| Series | media: davinci-vpbe: remove obsolete includes | expand |
Hi Arnd, Thank you for the patch. On Fri, Jun 28, 2019 at 11:51 AM Arnd Bergmann <arnd@arndb.de> wrote: > > 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> > --- > 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(-) > Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Cheers, --Prabhakar Lad > 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> > -- > 2.20.0 >
On 28/06/19 4:21 PM, Arnd Bergmann wrote: > 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: Sekhar Nori <nsekhar@ti.com> Thanks, Sekhar
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>
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> --- 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(-)