diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 07:54:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 07:54:16 -0700 |
| commit | 9f6ac7850a9c6363f4117fd2248e232a2d534627 (patch) | |
| tree | 7eac24b3b406f0bc9cb06eb8fe7cd19254275cba /drivers/media/video/saa7164/saa7164-cmd.c | |
| parent | db16826367fefcb0ddb93d76b66adc52eb4e6339 (diff) | |
| parent | 3f48258e50ef44d92a0e5c69c0cc5e663162d246 (diff) | |
| download | op-kernel-dev-9f6ac7850a9c6363f4117fd2248e232a2d534627.zip op-kernel-dev-9f6ac7850a9c6363f4117fd2248e232a2d534627.tar.gz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (13039): dib0700: not building CONFIG_DVB_TUNER_DIB0070 breaks compilation
V4L/DVB (13038): dvbdev: Remove an anoying/uneeded warning
V4L/DVB (13037): go7007: Revert compatibility code added at the wrong place
media: video: Fix build in saa7164
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-cmd.c')
| -rw-r--r-- | drivers/media/video/saa7164/saa7164-cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c index e097f1a0..c45966e 100644 --- a/drivers/media/video/saa7164/saa7164-cmd.c +++ b/drivers/media/video/saa7164/saa7164-cmd.c @@ -250,7 +250,7 @@ int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) unsigned long stamp; int r; - if (debug >= 4) + if (saa_debug >= 4) saa7164_bus_dump(dev); dprintk(DBGLVL_CMD, "%s(seqno=%d)\n", __func__, seqno); |
