| Message ID | 1365638712-1028578-12-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Thu, 11 Apr 2013 02:04:53 +0200 Arnd Bergmann <arnd@arndb.de> escreveu: > In multiplatform configurations, we cannot include headers > provided by only the exynos platform. Fortunately a number > of drivers that include those headers do not actually need > them, so we can just remove the inclusions. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > Cc: linux-media@vger.kernel.org > Cc: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> > --- > drivers/media/platform/exynos-gsc/gsc-regs.c | 1 - > drivers/media/platform/s5p-tv/sii9234_drv.c | 3 --- > 2 files changed, 4 deletions(-) > > diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.c b/drivers/media/platform/exynos-gsc/gsc-regs.c > index 6f5b5a4..e22d147 100644 > --- a/drivers/media/platform/exynos-gsc/gsc-regs.c > +++ b/drivers/media/platform/exynos-gsc/gsc-regs.c > @@ -12,7 +12,6 @@ > > #include <linux/io.h> > #include <linux/delay.h> > -#include <mach/map.h> > > #include "gsc-core.h" > > diff --git a/drivers/media/platform/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c > index d90d228..39b77d2 100644 > --- a/drivers/media/platform/s5p-tv/sii9234_drv.c > +++ b/drivers/media/platform/s5p-tv/sii9234_drv.c > @@ -23,9 +23,6 @@ > #include <linux/regulator/machine.h> > #include <linux/slab.h> > > -#include <mach/gpio.h> > -#include <plat/gpio-cfg.h> > - > #include <media/sii9234.h> > #include <media/v4l2-subdev.h> >
On 04/11/2013 02:13 AM, Mauro Carvalho Chehab wrote: > Em Thu, 11 Apr 2013 02:04:53 +0200 > Arnd Bergmann <arnd@arndb.de> escreveu: > >> In multiplatform configurations, we cannot include headers >> provided by only the exynos platform. Fortunately a number >> of drivers that include those headers do not actually need >> them, so we can just remove the inclusions. >> >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> Cc: linux-media@vger.kernel.org >> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> > > Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> This patch is already queued in the media tree for 3.10, and it can be found in -next now. Thanks, Sylwester
On Thursday 11 April 2013, Sylwester Nawrocki wrote: > On 04/11/2013 02:13 AM, Mauro Carvalho Chehab wrote: > > Em Thu, 11 Apr 2013 02:04:53 +0200 > > Arnd Bergmann <arnd@arndb.de> escreveu: > > > >> In multiplatform configurations, we cannot include headers > >> provided by only the exynos platform. Fortunately a number > >> of drivers that include those headers do not actually need > >> them, so we can just remove the inclusions. > >> > >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > >> Cc: linux-media@vger.kernel.org > >> Cc: Mauro Carvalho Chehab <mchehab@redhat.com> > > > > Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> > > This patch is already queued in the media tree for 3.10, and it can > be found in -next now. > Ok, thanks! I'll drop it from my series then. Arnd
diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.c b/drivers/media/platform/exynos-gsc/gsc-regs.c index 6f5b5a4..e22d147 100644 --- a/drivers/media/platform/exynos-gsc/gsc-regs.c +++ b/drivers/media/platform/exynos-gsc/gsc-regs.c @@ -12,7 +12,6 @@ #include <linux/io.h> #include <linux/delay.h> -#include <mach/map.h> #include "gsc-core.h" diff --git a/drivers/media/platform/s5p-tv/sii9234_drv.c b/drivers/media/platform/s5p-tv/sii9234_drv.c index d90d228..39b77d2 100644 --- a/drivers/media/platform/s5p-tv/sii9234_drv.c +++ b/drivers/media/platform/s5p-tv/sii9234_drv.c @@ -23,9 +23,6 @@ #include <linux/regulator/machine.h> #include <linux/slab.h> -#include <mach/gpio.h> -#include <plat/gpio-cfg.h> - #include <media/sii9234.h> #include <media/v4l2-subdev.h>
In multiplatform configurations, we cannot include headers provided by only the exynos platform. Fortunately a number of drivers that include those headers do not actually need them, so we can just remove the inclusions. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: linux-media@vger.kernel.org Cc: Mauro Carvalho Chehab <mchehab@redhat.com> --- drivers/media/platform/exynos-gsc/gsc-regs.c | 1 - drivers/media/platform/s5p-tv/sii9234_drv.c | 3 --- 2 files changed, 4 deletions(-)