summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-14 18:13:15 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-15 13:15:39 +0100
commitc38cd8729c90495687ad027a993099d9972ffbf1 (patch)
treebc7411fa9ceaff59fa1d13a9a937b8c337c49677
parentad1bb1b4e01c5ecbe32133ce6921d0e76cb76dcf (diff)
downloadop-kernel-dev-c38cd8729c90495687ad027a993099d9972ffbf1.zip
op-kernel-dev-c38cd8729c90495687ad027a993099d9972ffbf1.tar.gz
[media] davinci: do not include mach/hardware.h
It is now possible to build the davinci vpss code on multiplatform kernels, which causes a problem since the driver tries to incude the davinci platform specific mach/hardware.h file. Fortunately that file is not required at all in the driver, so we can simply remove the #include statement. Without this patch, building allyesconfig results in: drivers/media/platform/davinci/vpss.c:28:27: fatal error: mach/hardware.h: No such file or directory compilation terminated. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: "Lad, Prabhakar" <prabhakar.lad@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/platform/davinci/vpss.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/platform/davinci/vpss.c b/drivers/media/platform/davinci/vpss.c
index cdbff88..684e815 100644
--- a/drivers/media/platform/davinci/vpss.c
+++ b/drivers/media/platform/davinci/vpss.c
@@ -25,7 +25,6 @@
#include <linux/spinlock.h>
#include <linux/compiler.h>
#include <linux/io.h>
-#include <mach/hardware.h>
#include <media/davinci/vpss.h>
MODULE_LICENSE("GPL");
OpenPOWER on IntegriCloud