diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 17:12:17 -0800 |
| commit | 501706565b2d4d2d40d0d301d5411ede099b8a6f (patch) | |
| tree | 142a18bf1f1e74a09dbfa27540b893ade0fd797d /Documentation/DocBook/media-entities.tmpl | |
| parent | e93737b0f0159a61772894943199fd3b6f315641 (diff) | |
| parent | 2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff) | |
| download | lwn-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.gz lwn-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
include/net/tcp.h
Diffstat (limited to 'Documentation/DocBook/media-entities.tmpl')
| -rw-r--r-- | Documentation/DocBook/media-entities.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/media-entities.tmpl b/Documentation/DocBook/media-entities.tmpl index 0eb43c1970bb..bb5ab741220e 100644 --- a/Documentation/DocBook/media-entities.tmpl +++ b/Documentation/DocBook/media-entities.tmpl @@ -280,7 +280,7 @@ <!ENTITY sub-v4l2 SYSTEM "v4l/v4l2.xml"> <!ENTITY sub-intro SYSTEM "dvb/intro.xml"> <!ENTITY sub-frontend SYSTEM "dvb/frontend.xml"> -<!ENTITY sub-isdbt SYSTEM "dvb/isdbt.xml"> +<!ENTITY sub-dvbproperty SYSTEM "dvb/dvbproperty.xml"> <!ENTITY sub-demux SYSTEM "dvb/demux.xml"> <!ENTITY sub-video SYSTEM "dvb/video.xml"> <!ENTITY sub-audio SYSTEM "dvb/audio.xml"> @@ -288,6 +288,7 @@ <!ENTITY sub-net SYSTEM "dvb/net.xml"> <!ENTITY sub-kdapi SYSTEM "dvb/kdapi.xml"> <!ENTITY sub-examples SYSTEM "dvb/examples.xml"> +<!ENTITY sub-frontend-h SYSTEM "dvb/frontend.h.xml"> <!ENTITY sub-dvbapi SYSTEM "dvb/dvbapi.xml"> <!ENTITY sub-media SYSTEM "media.xml"> <!ENTITY sub-media-entities SYSTEM "media-entities.tmpl"> |