diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 10:49:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-13 10:49:39 -0300 |
| commit | 3d8bb4537fe9a985d386b7a51ee0c1f11d25a095 (patch) | |
| tree | aff679c0dffa6a6365ee183b3a21b8e46c90f689 /linux/drivers/media/video/saa7134 | |
| parent | 856378592a1b9be61e28092caf5e87446bae4694 (diff) | |
| parent | 0f8f6ec6e6b142a0398c9a0d9925432326d0b595 (diff) | |
| download | mediapointer-dvb-s2-3d8bb4537fe9a985d386b7a51ee0c1f11d25a095.tar.gz mediapointer-dvb-s2-3d8bb4537fe9a985d386b7a51ee0c1f11d25a095.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-core
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index d01281d1e..1bf2837b4 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -595,8 +595,10 @@ struct saa7134_dev { 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; |