diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:56:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:56:50 -0300 |
| commit | 034d0acc1b03bd1d68b729ea719978961628dd2a (patch) | |
| tree | 37d1972d39ab6a125e483ae293f8f205303c6921 /linux/Documentation | |
| parent | 6d20e235949a06a88588f8fcc0bcddce7e3a2924 (diff) | |
| parent | 7921b528872c180d255e21140cd54502dda70a7a (diff) | |
| download | mediapointer-dvb-s2-034d0acc1b03bd1d68b729ea719978961628dd2a.tar.gz mediapointer-dvb-s2-034d0acc1b03bd1d68b729ea719978961628dd2a.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~dougsland/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
| -rw-r--r-- | linux/Documentation/DocBook/Makefile | 8 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/linux/Documentation/DocBook/Makefile b/linux/Documentation/DocBook/Makefile index ad07875fe..ab8300f67 100644 --- a/linux/Documentation/DocBook/Makefile +++ b/linux/Documentation/DocBook/Makefile @@ -32,7 +32,7 @@ PS_METHOD = $(prefer-db2x) ### # The targets that may be used. -PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs +PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs media BOOKS := $(addprefix $(obj)/,$(DOCBOOKS)) xmldocs: $(BOOKS) @@ -45,12 +45,16 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS)) pdfdocs: $(PDF) HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS))) -htmldocs: $(HTML) +htmldocs: media $(HTML) $(call build_main_index) MAN := $(patsubst %.xml, %.9, $(BOOKS)) mandocs: $(MAN) +media: + mkdir -p $(srctree)/Documentation/DocBook/media/ + cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(srctree)/Documentation/DocBook/media/ + installmandocs: mandocs mkdir -p /usr/local/man/man9/ install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/ diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 0ac4d2544..2620d6034 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -171,3 +171,4 @@ 170 -> AverMedia AverTV Studio 505 [1461:a115] 171 -> Beholder BeholdTV X7 [5ace:7595] 172 -> RoverMedia TV Link Pro FM [19d1:0138] +173 -> Zolid Hybrid TV Tuner PCI [1131:2004] |