diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:35:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 08:35:40 -0700 |
| commit | 58f250714f2bfa3514798fde8b9d38a15e4a9836 (patch) | |
| tree | f4d297b4711f52c4cd0c182a58836812e76e50e9 /drivers/media/video/zoran_card.h | |
| parent | c32f1a34ff1097110469a240ea4539dc9c101e96 (diff) | |
| parent | c2f90e9536887fb76fb6a2aa239a70fc49beda10 (diff) | |
| download | kernel_samsung_crespo-58f250714f2bfa3514798fde8b9d38a15e4a9836.zip kernel_samsung_crespo-58f250714f2bfa3514798fde8b9d38a15e4a9836.tar.gz kernel_samsung_crespo-58f250714f2bfa3514798fde8b9d38a15e4a9836.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (98 commits)
V4L/DVB (8549): mxl5007: Fix an error at include file
V4L/DVB (8548): pwc: Fix compilation
V4L/DVB (8546): add tuner-3036 and dpc7146 drivers to feature-removal-schedule.txt
V4L/DVB (8546): saa7146: fix read from uninitialized memory
V4L/DVB (8544): gspca: probe/open race.
V4L/DVB (8543): em28xx: Rename #define for Compro VideoMate ForYou/Stereo
V4L/DVB (8542): em28xx: AMD ATI TV Wonder HD 600 entry at cards struct is duplicated
V4L/DVB (8541): em28xx: HVR-950 entry is duplicated.
V4L/DVB (8540): em28xx-cards: Add Compro VideoMate ForYou/Stereo model
V4L/DVB (8539): em28xx-cards: New supported IDs for analog models
V4L/DVB (8538): em28xx-cards: Add GrabBeeX+ USB2800 model
V4L/DVB (8534): remove select's of FW_LOADER
V4L/DVB (8522): videodev2: Fix merge conflict
V4L/DVB (8532): mxl5007t: remove excessive locks
V4L/DVB (8531): mxl5007t: move i2c gate handling outside of mutex protected code blocks
V4L/DVB (8530): au0828: add support for new revision of HVR950Q
V4L/DVB (8529): mxl5007t: enable _init and _sleep power management functionality
V4L/DVB (8528): add support for MaxLinear MxL5007T silicon tuner
V4L/DVB (8526): saa7146: fix VIDIOC_ENUM_FMT
V4L/DVB (8525): fix a few assorted spelling mistakes.
...
Diffstat (limited to 'drivers/media/video/zoran_card.h')
| -rw-r--r-- | drivers/media/video/zoran_card.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zoran_card.h b/drivers/media/video/zoran_card.h index 1b5c417..e4dc9d2 100644 --- a/drivers/media/video/zoran_card.h +++ b/drivers/media/video/zoran_card.h @@ -41,7 +41,7 @@ extern int zr36067_debug; /* Anybody who uses more than four? */ #define BUZ_MAX 4 extern int zoran_num; -extern struct zoran zoran[BUZ_MAX]; +extern struct zoran *zoran[BUZ_MAX]; extern struct video_device zoran_template; |