diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:39:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:39:09 -0400 |
| commit | e317234975cb7463b8ca21a93bb6862d9dcf113f (patch) | |
| tree | 4446fa3a21364f3cba23a22aa2a94027f169d8df /drivers/media/video/saa7164/Makefile | |
| parent | f37ab0fba271e43edab0e3ae9fe644fcda455402 (diff) | |
| parent | 7483d45f0aee3afc0646d185cabd4af9f6cab58c (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- V4L2 API additions to better support JPEG compression control
- media API additions to properly support MPEG decoders
- V4L2 API additions for image crop/scaling
- a few other V4L2 API DocBook fixes/improvements
- two new DVB frontend drivers: m88rs2000 and rtl2830
- two new DVB drivers: az6007 and rtl28xxu
- a framework for ISA drivers, that removed lots of common code found
at the ISA radio drivers
- a new FM transmitter driver (radio-keene)
- a GPIO-based IR receiver driver
- a new sensor driver: mt9m032
- some new video drivers: adv7183, blackfin, mx2_emmaprp, sii9234_drv,
vs6624
- several new board additions, driver fixes, improvements and cleanups.
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (295 commits)
[media] update CARDLIST.em28xx
[media] partially reverts changeset fa5527c
[media] stb0899: fix the limits for signal strength values
[media] em28xx: support for 2304:0242 PCTV QuatroStick (510e)
[media] em28xx: support for 2013:0251 PCTV QuatroStick nano (520e)
[media] -EINVAL -> -ENOTTY
[media] gspca - sn9c20x: Cleanup source
[media] gspca - sn9c20x: Simplify register write for capture start/stop
[media] gspca - sn9c20x: Add automatic JPEG compression mechanism
[media] gspca - sn9c20x: Greater delay in case of sensor no response
[media] gspca - sn9c20x: Optimize the code of write sequences
[media] gspca - sn9c20x: Add the JPEG compression quality control
[media] gspca - sn9c20x: Add a delay after Omnivision sensor reset
[media] gspca - sn9c20x: Propagate USB errors to higher level
[media] gspca - sn9c20x: Use the new video control mechanism
[media] gspca - sn9c20x: Fix loss of frame start
[media] gspca - zc3xx: Lack of register 08 value for sensor cs2102k
[media] gspca - ov534_9: Add brightness to OmniVision 5621 sensor
[media] gspca - zc3xx: Add V4L2_CID_JPEG_COMPRESSION_QUALITY control support
[media] pvrusb2: fix 7MHz & 8MHz DVB-T tuner support for HVR1900 rev D1F5
...
Diffstat (limited to 'drivers/media/video/saa7164/Makefile')
| -rw-r--r-- | drivers/media/video/saa7164/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/saa7164/Makefile b/drivers/media/video/saa7164/Makefile index ecd5811dc486..068443af30c8 100644 --- a/drivers/media/video/saa7164/Makefile +++ b/drivers/media/video/saa7164/Makefile | |||
| @@ -4,9 +4,9 @@ saa7164-objs := saa7164-cards.o saa7164-core.o saa7164-i2c.o saa7164-dvb.o \ | |||
| 4 | 4 | ||
| 5 | obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o | 5 | obj-$(CONFIG_VIDEO_SAA7164) += saa7164.o |
| 6 | 6 | ||
| 7 | ccflags-y += -Idrivers/media/video | 7 | ccflags-y += -I$(srctree)/drivers/media/video |
| 8 | ccflags-y += -Idrivers/media/common/tuners | 8 | ccflags-y += -I$(srctree)/drivers/media/common/tuners |
| 9 | ccflags-y += -Idrivers/media/dvb/dvb-core | 9 | ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core |
| 10 | ccflags-y += -Idrivers/media/dvb/frontends | 10 | ccflags-y += -I$(srctree)/drivers/media/dvb/frontends |
| 11 | 11 | ||
| 12 | ccflags-y += $(extra-cflags-y) $(extra-cflags-m) | 12 | ccflags-y += $(extra-cflags-y) $(extra-cflags-m) |