projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
platform
/
davinci
/
vpss.c
diff --git
a/drivers/media/platform/davinci/vpss.c
b/drivers/media/platform/davinci/vpss.c
index 494d32231fb59a65dec536db94844861fb83a8bd..a19c552232d1548afd4c142e19f0b040f0356b61 100644
(file)
--- 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");