summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/media-entities.tmpl
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-08-16 20:40:44 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-08-16 20:40:44 +0200
commit9714d315d28aef77a097fe905b25cc273c3d72ad (patch)
tree0ae1150b0723e925785ce774c3554f29fda050f6 /Documentation/DocBook/media-entities.tmpl
parentb43: move hwrng registration driver to wireless core initialization (diff)
parentath5k: disable ASPM L0s for all cards (diff)
downloadlinux-9714d315d28aef77a097fe905b25cc273c3d72ad.tar.xz
linux-9714d315d28aef77a097fe905b25cc273c3d72ad.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'Documentation/DocBook/media-entities.tmpl')
-rw-r--r--Documentation/DocBook/media-entities.tmpl1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl
index 5d4d40f429a5..6ae97157b1c7 100644
--- a/Documentation/DocBook/media-entities.tmpl
+++ b/Documentation/DocBook/media-entities.tmpl
@@ -218,6 +218,7 @@
<!ENTITY sub-dev-teletext SYSTEM "v4l/dev-teletext.xml">
<!ENTITY sub-driver SYSTEM "v4l/driver.xml">
<!ENTITY sub-libv4l SYSTEM "v4l/libv4l.xml">
+<!ENTITY sub-lirc_device_interface SYSTEM "v4l/lirc_device_interface.xml">
<!ENTITY sub-remote_controllers SYSTEM "v4l/remote_controllers.xml">
<!ENTITY sub-fdl-appendix SYSTEM "v4l/fdl-appendix.xml">
<!ENTITY sub-close SYSTEM "v4l/func-close.xml">