diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-09 19:14:32 +0200 |
| commit | 8dd9117cc7a021ced1c5cf177e2d44dd92b88617 (patch) | |
| tree | cad990f58f9ec6d400226dda86718fc10781416e /Documentation/DocBook/media/Makefile | |
| parent | e1000e: add device IDs for i218 (diff) | |
| parent | Fix staging driver use of VM_RESERVED (diff) | |
| download | linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.tar.xz linux-8dd9117cc7a021ced1c5cf177e2d44dd92b88617.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Pulled mainline in order to get the UAPI infrastructure already
merged before I pull in David Howells's UAPI trees for networking.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/DocBook/media/Makefile')
| -rw-r--r-- | Documentation/DocBook/media/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile index 362520992ced..9b7e4c557928 100644 --- a/Documentation/DocBook/media/Makefile +++ b/Documentation/DocBook/media/Makefile @@ -300,7 +300,7 @@ $(MEDIA_OBJ_DIR)/media-entities.tmpl: $(MEDIA_OBJ_DIR)/v4l2.xml @( \ for ident in $(IOCTLS) ; do \ entity=`echo $$ident | tr _ -` ; \ - id=`grep "<refname>$$ident" $(MEDIA_OBJ_DIR)/vidioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \ + id=`grep "<refname>$$ident" $(MEDIA_OBJ_DIR)/vidioc-*.xml $(MEDIA_OBJ_DIR)/media-ioc-*.xml | sed -r s,"^.*/(.*).xml.*","\1",` ; \ echo "<!ENTITY $$entity \"<link" \ "linkend='$$id'><constant>$$ident</constant></link>\">" \ >>$@ ; \ |