diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-23 20:38:20 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-23 20:38:20 -0800 |
commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /include/media/videobuf-core.h | |
parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) |
Merge branch 'master' of ../linux-2.6/
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 */ |