diff options
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/i2c-id.h | 1 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index 21338bb34..9418519a5 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -115,6 +115,7 @@ #define I2C_DRIVERID_BT866 85 /* Conexant bt866 video encoder */ #define I2C_DRIVERID_KS0127 86 /* Samsung ks0127 video decoder */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ +#define I2C_DRIVERID_ISL1208 88 /* Intersil ISL1208 RTC */ #define I2C_DRIVERID_I2CDEV 900 #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 171a63f65..8c3fd8fdd 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -13,9 +13,6 @@ #include <linux/poll.h> #include <linux/fs.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69) -#include <linux/devfs_fs_kernel.h> -#endif #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include <linux/device.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) @@ -341,11 +338,6 @@ void *priv; #else struct semaphore lock; /* ... helper function uses these */ #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69) - devfs_handle_t devfs_handle; /* devfs */ -#else - char devfs_name[64]; /* devfs */ -#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) struct class_device class_dev; /* sysfs */ #endif |