diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:49:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:49:47 -0800 |
| commit | 20ef0f1ad0035cd7acc6cbcbc018b2dcd891e274 (patch) | |
| tree | f98facca9df16f65590140f6b56c767bb8b6954c /include/media/videobuf-core.h | |
| parent | 9960c90c0cb9652f69ce794c7bf99bb3acf23552 (diff) | |
| parent | 6165894fb6293072848e5699f3fcbe88b7c60815 (diff) | |
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: (59 commits)
V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum
V4L/DVB (7205): tuner-xc2028 depends on FW_LOADER
V4L/DVB (7201): cx88-mpeg: Fix race condition in variable access
V4L/DVB (7200): Fix FM firmware loading
V4L/DVB (7198): V4L, include ioctl.h in videodev headers
V4L/DVB (7197): bttv: Fix overlay divide error
V4L/DVB (7195): xc5000: fix build error when built as module
V4L/DVB (7194): cx88-mpeg: Allow concurrent access to cx88-mpeg devices
V4L/DVB (7193): tveeprom: Add proper tuner mapping for hauppauge eeprom id 133
V4L/DVB (7192): Adds support for Genius TVGo A11MCE
V4L/DVB (7189): autosuspend support
V4L/DVB (7188): radio-si470x version 1.0.6
V4L/DVB (7186): tda10086: make the 22kHz tone for DISEQC a config option
V4L/DVB (7183): radio-si470x: fix build warning
V4L/DVB (7180): em28xx: add URB_NO_TRANSFER_DMA_MAP, since urb->transfer_dma is set
V4L/DVB (7179): Allow more than one em28xx board
V4L/DVB (7164): em28xx-alsa: Add a missing mutex
V4L/DVB (7163): em28xx: makes audio settings more stable
V4L/DVB (7162): em28xx: Fix endian and returns the correct values
V4L/DVB (7161): em28xx: Fix printing debug values higher than 127
...
Diffstat (limited to 'include/media/videobuf-core.h')
| -rw-r--r-- | include/media/videobuf-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/videobuf-core.h b/include/media/videobuf-core.h index 97f14d46959..99033945cde 100644 --- a/include/media/videobuf-core.h +++ b/include/media/videobuf-core.h @@ -149,7 +149,7 @@ struct videobuf_qtype_ops { }; struct videobuf_queue { - struct mutex lock; + struct mutex vb_lock; spinlock_t *irqlock; void *dev; /* on pci, points to struct pci_dev */ |