projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'acpi-misc'
[linux-2.6-microblaze.git]
/
include
/
media
/
v4l2-h264.h
diff --git
a/include/media/v4l2-h264.h
b/include/media/v4l2-h264.h
index
f08ba18
..
d2314f4
100644
(file)
--- a/
include/media/v4l2-h264.h
+++ b/
include/media/v4l2-h264.h
@@
-10,7
+10,7
@@
#ifndef _MEDIA_V4L2_H264_H
#define _MEDIA_V4L2_H264_H
-#include <media/
h264
-ctrls.h>
+#include <media/
v4l2
-ctrls.h>
/**
* struct v4l2_h264_reflist_builder - Reference list builder object