diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 11:53:31 -0300 |
| commit | 4c691e7dabc47811013c7266fa5f32fe96687c36 (patch) | |
| tree | a6185d7724be9b53607ab988625fd75052b1a9b2 /linux/drivers/media/video/saa7134/saa7134.h | |
| parent | 8201f56625ffdc9146ad8eb4525c1b50e6194f5a (diff) | |
| parent | 4198bf24c30e208e3c1a4d833e52ee2330bdb008 (diff) | |
| download | mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.gz mediapointer-dvb-s2-4c691e7dabc47811013c7266fa5f32fe96687c36.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-vbi3
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 8c164bc79..1bf2837b4 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -594,6 +594,12 @@ struct saa7134_dev { int nosignal; unsigned int insuspend; + /* I2C keyboard data */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) + struct i2c_board_info info; + struct IR_i2c_init_data init_data; +#endif + /* SAA7134_MPEG_* */ struct saa7134_ts ts; struct saa7134_dmaqueue ts_q; |