diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-10 05:26:05 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-10 05:26:05 -0200 |
| commit | 9367837bfc7027ada0f7f128b4eba5b65fc8a13a (patch) | |
| tree | 86f726adb9891616bc22f7cac5e288e7b75fc6e9 /linux/include/media/saa7146.h | |
| parent | 39564bcd09a0807164f279f4700d4cc6f5ea166c (diff) | |
| parent | b857ad615158d8e49953055fb34cd55050d5ebf2 (diff) | |
| download | mediapointer-dvb-s2-9367837bfc7027ada0f7f128b4eba5b65fc8a13a.tar.gz mediapointer-dvb-s2-9367837bfc7027ada0f7f128b4eba5b65fc8a13a.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-saa7146
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/saa7146.h')
| -rw-r--r-- | linux/include/media/saa7146.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index 8034124f1..8cb90d36e 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -14,6 +14,7 @@ #include "compat.h" #include <linux/mutex.h> #include <linux/scatterlist.h> +#include <media/v4l2-device.h> #include <linux/vmalloc.h> /* for vmalloc() */ #include <linux/mm.h> /* for vmalloc_to_page() */ @@ -111,6 +112,8 @@ struct saa7146_dev struct list_head item; + struct v4l2_device v4l2_dev; + /* different device locks */ spinlock_t slock; struct mutex lock; @@ -146,6 +149,11 @@ struct saa7146_dev struct saa7146_dma d_rps1; }; +static inline struct saa7146_dev *to_saa7146_dev(struct v4l2_device *v4l2_dev) +{ + return container_of(v4l2_dev, struct saa7146_dev, v4l2_dev); +} + /* from saa7146_i2c.c */ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate); |