diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 01:42:56 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 01:42:56 -0300 |
| commit | f90000c87dfbaa497418c7b1550bb88596fa3f0c (patch) | |
| tree | 0c5b6b5bd05facb11d85a9786ffe5c47980b5563 /linux | |
| parent | 9d84ca95c6e87ea6c4b03fbd781e4a80be99cae2 (diff) | |
| download | mediapointer-dvb-s2-f90000c87dfbaa497418c7b1550bb88596fa3f0c.tar.gz mediapointer-dvb-s2-f90000c87dfbaa497418c7b1550bb88596fa3f0c.tar.bz2 | |
Backport a few fixes needed do be done at -git to properly compile things
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Documentation/DocBook/Makefile | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/v4l2-device.c | 2 | ||||
| -rw-r--r-- | linux/drivers/staging/cx25821/Makefile | 1 |
3 files changed, 8 insertions, 3 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/drivers/media/video/v4l2-device.c b/linux/drivers/media/video/v4l2-device.c index 655d19cd6..016c62f6c 100644 --- a/linux/drivers/media/video/v4l2-device.c +++ b/linux/drivers/media/video/v4l2-device.c @@ -86,7 +86,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) /* Unregister subdevs */ list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) { v4l2_device_unregister_subdev(sd); -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { struct i2c_client *client = v4l2_get_subdevdata(sd); diff --git a/linux/drivers/staging/cx25821/Makefile b/linux/drivers/staging/cx25821/Makefile index 2029cd046..10f87f05d 100644 --- a/linux/drivers/staging/cx25821/Makefile +++ b/linux/drivers/staging/cx25821/Makefile @@ -9,5 +9,6 @@ obj-$(CONFIG_VIDEO_CX25821) += cx25821.o obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o EXTRA_CFLAGS += -Idrivers/media/video +EXTRA_CFLAGS += -Idrivers/media/common/tuners EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core EXTRA_CFLAGS += -Idrivers/media/dvb/frontends |