diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-02 18:36:12 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-02 18:36:12 +0200 |
| commit | 9b54bc1a265d4349a6ded6fdefd7bd70b3a48b81 (patch) | |
| tree | 9461c241cf4899056f6ad8b123c5fffbeaf72540 /linux/include | |
| parent | cb228051a31b5d0f78a3b3e7e8a960d1658afcf5 (diff) | |
| parent | 6c14e144cdc5613c2d56f1a991b87366184c634c (diff) | |
| download | mediapointer-dvb-s2-9b54bc1a265d4349a6ded6fdefd7bd70b3a48b81.tar.gz mediapointer-dvb-s2-9b54bc1a265d4349a6ded6fdefd7bd70b3a48b81.tar.bz2 | |
merge: from master
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/i2c-id.h | 4 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index 679b46a6a..c8b81f419 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -108,6 +108,10 @@ #define I2C_DRIVERID_UPD64083 78 /* upd64083 video processor */ #define I2C_DRIVERID_UPD64031A 79 /* upd64031a video processor */ #define I2C_DRIVERID_SAA717X 80 /* saa717x video encoder */ +#define I2C_DRIVERID_DS1672 81 /* Dallas/Maxim DS1672 RTC */ +#define I2C_DRIVERID_X1205 82 /* Xicor/Intersil X1205 RTC */ +#define I2C_DRIVERID_PCF8563 83 /* Philips PCF8563 RTC */ +#define I2C_DRIVERID_RS5C372 84 /* Ricoh RS5C372 RTC */ #define I2C_DRIVERID_I2CDEV 900 #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index b87334d72..922980c61 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -84,7 +84,7 @@ struct video_device int minor; /* device ops + callbacks */ - struct file_operations *fops; + const struct file_operations *fops; void (*release)(struct video_device *vfd); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) |