summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-05-02merge: from masterMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02Added some autogenerated files at hgignoreMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02Removed obsoleted CVS filesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Those files were used on cvs tree. they make no sense for hg. kenel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02[PATCH] Last DMA_xBIT_MASK cleanupsMauro Carvalho Chehab
These are the last conversions of pci_set_dma_mask(), pci_set_consistent_dma_mask() and pci_dma_supported() to use DMA_xBIT_MASK constants from linux/dma-mapping.h kernel-sync: Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02merge: http://linuxtv.org/hg/~mkrufky/blackbirdMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02Reverted from previous patch since it is not requiredMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02Fix checking logic for a broken xawtv versionMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> moved from if to ifndef. Also added such tests at gentree script. Gentree updated to its latest version. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02Pwc-dec23 oops fixMauro Carvalho Chehab
From: akpm@osdl.org <akpm@osdl.org> drivers/media/video/pwc/pwc-dec23.c: In function `pwc_dec23_decompress': drivers/media/video/pwc/pwc-dec23.c:885: warning: null argument where non-null required (arg 2) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02Core: ULE fixes and RFC4326 additionsMauro Carvalho Chehab
From: Christian Praehauser <cpraehaus@cosy.sbg.ac.at> Fix some problems regarding support for Unidirectional Lightweight Encapsulation (ULE) in dvbnet.c. The original ULE code was based on a draft. In the meantime, ULE has been published in RFC 4326 (ftp://ftp.rfc-editor.org/in-notes/rfc4326.txt). With these fixes, and some additions (which are included in the patch), the decaps code should now be complient to RFC4326. Signed-off-by: Christian Praehauser <cpraehaus@cosy.sbg.ac.at> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-05-02Fix CONFIG_VIDEO_VIVI=y build bugMauro Carvalho Chehab
From: Ingo Molnar <mingo@elte.hu> CONFIG_VIDEO_VIVI depends on CONFIG_VIDEO_BUF. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-30cx88-blackbird: pause the encoder during frequency changeMichael Krufky
From: Valentin Zagura <puthre@gmail.com> Added code to cx88-blackbird.c to treat the VIDIOC_S_FREQUENCY ioctl to stop mpeg stream before changing the frequency and restart it after. It seems that the mpeg stream needs to be paused while changing the channel frequency, otherwise the mpeg encoder enters into a bad state, producing artifacts. Signed-off-by: Valentin Zagura <puthre@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-29Audio soft reset improvementsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The soft reset (de)assert commands where not at the right place. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-29From: Hans Verkuil <hverkuil@xs4all.nl>Hans Verkuil
merge: from master Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-29From: Hans Verkuil <hverkuil@xs4all.nl>Hans Verkuil
Stop/start microcontroller when changing sampling frequency Stop/start microcontroller when changing sampling frequency to prevent tinny audio. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2006-04-28merge: from ~mkrufky/blackbird.fwMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-28Bt8xx/bttv-cards.c: fix off-by-one errorsMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch fixes two off-by-one errors spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-28Em28xx/: possible cleanupsMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch contains the following possible cleanups: - make the following needlessly global functions static: - em28xx-core.c: em28xx_accumulator_set() - em28xx-core.c: em28xx_capture_area_set() - em28xx-core.c: em28xx_scaler_set() - em28xx-core.c: em28xx_isocIrq() - remove the following unused EXPORT_SYMBOL's: - em28xx-cards.c: em28xx_boards - em28xx-cards.c: em28xx_bcount - em28xx-cards.c: em28xx_id_table Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-28merge: http://linuxtv.org/hg/~mcisely/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-28merge: http://linuxtv.org/hg/~quincy/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-28Improved make release method to allow compiling against an arbitrary dirMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Now, with make DIR=<foo>, it is possible to compile V4L/DVB with a non-installed dir. This will allow better checking on compatibility issues (especially for -git tree) Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-28Add missing pll gate control callsAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> I'd missed some of these out, breaking the av7110 tuning. I then checked for more and added them in where necessary. They may not actually be necessary in all these locations, but if not, they'll simply have no effect. Add small delay to stv0299 pll gate control to fix tuning problems. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-28Support new dvb-ttusb-budget boards with stv0297Andrew de Quincey
From: Thomas Kaiser <linux-dvb AT kaiser-linux.li> Added config switch to stv0297 to control i2c STOP during write behaviour. Update frontend init in dvb-ttusb-budget. Enable i2c STOP on other users of stv0297. Signed-off-by: Thomas Kaiser <linux-dvb AT kaiser-linux.li> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-28Add isl6421 moduleAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> Driver for the ISL6421 LNB chip Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-28Convert lnbp21 to a moduleAndrew de Quincey
From: Andrew de Quincey <adq_dvb@lidskialf.net> Convert lnbp21.h into a linux kernel module. Fix up previous users to use it. Convert dvb-ttusb-budget to use it. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-27Vivi.c: possible cleanupsMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> This patch contains the following possible cleanup: - make needlessly global functions static - remove unused #ifndef kzalloc kzalloc() #define - remove inline's from functions Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Fixed a bug at make menuconfigMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Compilation for DVB_AV7110_FIRMWARE seems to be weirdMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Some systems use a previous config information to generate a default config. This seems to cause troubles on some systems. This patch fixes compilation for AV7110 firmware inside V4L/DVB tree. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Fix building when no .version is foundMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Makefile.media requires first .version. Fixed. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Fix VIDEO_DEV=m, VIDEO_V4L1_COMPAT=yMauro Carvalho Chehab
From: Adrian Bunk <bunk@stusta.de> If CONFIG_VIDEO_DEV=m and CONFIG_VIDEO_V4L1_COMPAT=y, v4l1-compat should be built as a module (currently, it isn't built at all leading to problems with modules using it). Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Patch reverted since it is broken.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Disable stv0297_cs2 code from being used normally.Andrew de Quincey
From: Mauro Carvalho Chehab <mchehab@infradead.org> stv0297_cs2 should be merged into the main stv0297. In order not to lose information we have come up with this temporary compromise. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
2006-04-27merge: http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27merge: http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27move install / rminstall invocation rules to v4l/MakefileMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> This patch moves the 'make install' and 'make rminstall' rules into the central Makefile. This allows for us to assign dependencies to these rules, so that modules built as a reult of a tree-merge don't have to be installed separately. Now, instead of doing 'make install && make ivtv-install', the simple command, 'make install' will call the sub-install rules and take care of the entire task. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-27Make bt866 and ks0127 work at V4L/DVB treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Git dvb Kconfig fix 2Mauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> A trainwreck. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27AverMedia 6 Eyes AVS6EYES supportMauro Carvalho Chehab
From: Martin Samuelsson <sam@home.se> Add support for the AverMedia 6 Eyes MJPEG card. - Updated drivers/media/video/Kconfig with AVS6EYES options. - Added CONFIG_VIDEO_ZORAN_AVS6EYES to drivers/media/video/Makefile. - Added I2C_DRIVERID_BT866 and I2C_DRIVERID_KS0127 to include/linux/i2c-id.h - Added drivers/media/video/ks0127.c, imported and modified from the Marvel project. - Added drivers/media/video/ks0127.h, imported and modified from the Marvel project. - Added drivers/media/video/bt866.c, ported from a 2.4 version by Christer Weinigel. - Added AVS6EYES to drivers/media/video/zoran_card.c - Added input_mux to all cards in drivers/media/video/zoran_card.c - Added input mux module parameter to drivers/media/video/zoran_card.c - Added AVS6EYES to card_type in drivers/media/video/zoran.h - Added input_mux to card_info in drivers/media/video/zoran.h - Upped BUZ_MAX_INPUT in drivers/media/video/zoran.h from 8 to 16, as the AVS6EYES has 10. - Updated Documentation/video4linux/Zoran with information about AVS6EYES. Signed-off-by: Martin Samuelsson <sam@home.se> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Added Zoran docs to the treeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Vivi build fixMauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> drivers/media/video/vivi.c: In function `vivi_map_sg': drivers/media/video/vivi.c:799: error: `DMA_NONE' undeclared (first use in this function) drivers/media/video/vivi.c:799: error: (Each undeclared identifier is reported only once drivers/media/video/vivi.c:799: error: for each function it appears in.) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Git-dvb-Kconfig-fixMauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> x86 allmodconfig: Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27Sparc32-vivi-fixMauro Carvalho Chehab
From: Andrew Morton <akpm@osdl.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-27fix ivtv tree merge help info in INSTALL fileMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> ivtv - enable merged ivtv build, using the latest ivtv sources from ivtvdriver.org (requires subversion) cx88-ivtv - enable cx88-blackbird ivtv API emulation ivtv-update - update ivtv sources ivtv-install - install ivtv and/or cx88-ivtv modules (requires root access) Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-27dvb: rename dvb_pll_tdvs_tua6034 to dvb_pll_lg_tdvs_h06xfMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-27v4l: rename TUNER_LG_TDVS_H062F to TUNER_LG_TDVS_H06XFMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2006-04-26Some vars were not initializated by the script. fixed.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This avoids warnings when running make *config Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-26Re-inserting strip at install ruleMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> strip is responsible to remove all debug info from kernel object files. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-26The latest patch partially reverted some changes. fixing it.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-26Cleaned an obsoleted ruleMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-26Some improvements at MakefileMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Included a INSTALL file make help shows the INSTALL file added make release to force compiling against a specified version Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-04-26ZC0301 driver updatesMauro Carvalho Chehab
From: Luca Risolia <luca.risolia@studio.unibo.it> This is a patch fixing a small bug in zc0301_start_transfer() introduced in the ZC0301 driver v1.04. Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>