diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-28 11:26:12 -0400 |
commit | 7a9787e1eba95a166265e6a260cf30af04ef0a99 (patch) | |
tree | e730a4565e0318140d2fbd2f0415d18a339d7336 /drivers/media/video/bw-qcam.h | |
parent | 41b9eb264c8407655db57b60b4457fe1b2ec9977 (diff) | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) |
Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks
Diffstat (limited to 'drivers/media/video/bw-qcam.h')
-rw-r--r-- | drivers/media/video/bw-qcam.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/bw-qcam.h b/drivers/media/video/bw-qcam.h index 6701dafbc0da..8a60c5de0935 100644 --- a/drivers/media/video/bw-qcam.h +++ b/drivers/media/video/bw-qcam.h | |||
@@ -65,4 +65,5 @@ struct qcam_device { | |||
65 | int top, left; | 65 | int top, left; |
66 | int status; | 66 | int status; |
67 | unsigned int saved_bits; | 67 | unsigned int saved_bits; |
68 | unsigned long in_use; | ||
68 | }; | 69 | }; |