Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 664a41b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
  [media] ir-mce_kbd-decoder: include module.h for its facilities
  [media] ov5642: include module.h for its facilities
  [media] em28xx: Fix DVB-C maxsize for em2884
  [media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
  [media] v4l: mt9v032: Fix Bayer pattern
  [media] V4L: mt9m111: rewrite set_pixfmt
  [media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
  [media] V4L: initial driver for ov5642 CMOS sensor
  [media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
  [media] V4L: soc-camera: remove soc-camera bus and devices on it
  [media] V4L: soc-camera: un-export the soc-camera bus
  [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
  [media] V4L: add media bus configuration subdev operations
  [media] V4L: soc-camera: group struct field initialisations together
  [media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
  [media] V4L: pxa-camera: switch to using standard PM hooks
  [media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
  [media] Don't OOPS if videobuf_dvb_get_frontend return NULL
  [media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
  [media] omap3isp: Support configurable HS/VS polarities
  ...

Fix up conflicts:
 - arch/arm/mach-omap2/board-rx51-peripherals.c:
     cleanup regulator supply definitions in mach-omap2
   vs
     OMAP3: RX-51: define vdds_csib regulator supply
 - drivers/staging/tm6000/tm6000-alsa.c (trivial)
parents 983236b5 ee2ce3a0

Documentation/DocBook/.gitignore

+4 −1
Original line number Original line Diff line number Diff line
@@ -8,4 +8,7 @@ 
*.dvi

*.dvi

*.log

*.log

*.out

*.out

media/
 
*.png

*.gif

media-indices.tmpl

media-entities.tmpl

Documentation/DocBook/Makefile

+10 −21
Original line number Original line Diff line number Diff line
@@ -14,7 +14,9 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ 
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml media.xml drm.xml

	    tracepoint.xml drm.xml media_api.xml



include $(srctree)/Documentation/DocBook/media/Makefile





###

###

# The build process is as follows (targets):

# The build process is as follows (targets):
@@ -32,7 +34,7 @@ PS_METHOD = $(prefer-db2x) 




###

###

# The targets that may be used.

# The targets that may be used.

PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks

PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs





BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))

BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))

xmldocs: $(BOOKS)

xmldocs: $(BOOKS)
@@ -45,27 +47,14 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS)) 
pdfdocs: $(PDF)

pdfdocs: $(PDF)





HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))

HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))

htmldocs: $(HTML) xmldoclinks

htmldocs: $(HTML)

	$(call build_main_index)

	$(call build_main_index)

	$(call build_images)

	$(call build_images)

	$(call install_media_images)





MAN := $(patsubst %.xml, %.9, $(BOOKS))

MAN := $(patsubst %.xml, %.9, $(BOOKS))

mandocs: $(MAN)

mandocs: $(MAN)





build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \

	       cp $(srctree)/Documentation/DocBook/dvb/*.png \

	          $(srctree)/Documentation/DocBook/v4l/*.gif \

		  $(objtree)/Documentation/DocBook/media/



xmldoclinks:

ifneq ($(objtree),$(srctree))

	for dep in dvb media-entities.tmpl media-indices.tmpl v4l; do \

		rm -f $(objtree)/Documentation/DocBook/$$dep \

		&& ln -s $(srctree)/Documentation/DocBook/$$dep $(objtree)/Documentation/DocBook/ \

		|| exit; \

	done

endif



installmandocs: mandocs

installmandocs: mandocs

	mkdir -p /usr/local/man/man9/

	mkdir -p /usr/local/man/man9/

	install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/

	install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/
@@ -97,7 +86,7 @@ define rule_docproc 
        ) > $(dir $@).$(notdir $@).cmd

        ) > $(dir $@).$(notdir $@).cmd

endef

endef





%.xml: %.tmpl xmldoclinks FORCE

%.xml: %.tmpl FORCE

	$(call if_changed_rule,docproc)

	$(call if_changed_rule,docproc)





###

###
@@ -150,7 +139,7 @@ quiet_cmd_db2pdf = PDF $@ 




index = index.html

index = index.html

main_idx = Documentation/DocBook/$(index)

main_idx = Documentation/DocBook/$(index)

build_main_index = rm -rf $(main_idx) && \

build_main_index = rm -rf $(main_idx); \

		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \

		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \

		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \

		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \

		   cat $(HTML) >> $(main_idx)

		   cat $(HTML) >> $(main_idx)
@@ -242,7 +231,7 @@ clean-files := $(DOCBOOKS) \ 




clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man

clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man





cleandocs:

cleandocs: cleanmediadocs

	$(Q)rm -f $(call objectify, $(clean-files))

	$(Q)rm -f $(call objectify, $(clean-files))

	$(Q)rm -rf $(call objectify, $(clean-dirs))

	$(Q)rm -rf $(call objectify, $(clean-dirs))

Documentation/DocBook/dvb/dvbproperty.xml

deleted100644 → 0
+0 −590

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/DocBook/dvb/dvbstb.png

deleted100644 → 0
−22.1 KiB
Loading image diff...

Documentation/DocBook/dvb/frontend.h.xml

deleted100644 → 0
+0 −428

File deleted.

Preview size limit exceeded, changes collapsed.