diff options
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/msp3400.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda9887.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index a7a43d748..4eabc2ef8 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -2254,11 +2254,13 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) static int msp_suspend(struct device * dev, pm_message_t state) -#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#else +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int msp_suspend(struct device * dev, pm_message_t state, u32 level) #else static int msp_suspend(struct device * dev, u32 state, u32 level) #endif +#endif { struct i2c_client *client = container_of(dev, struct i2c_client, dev); diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index a7a43d748..4eabc2ef8 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -2254,11 +2254,13 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) static int msp_suspend(struct device * dev, pm_message_t state) -#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#else +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int msp_suspend(struct device * dev, pm_message_t state, u32 level) #else static int msp_suspend(struct device * dev, u32 state, u32 level) #endif +#endif { struct i2c_client *client = container_of(dev, struct i2c_client, dev); diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index c961fe9e0..215a5b1a4 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -901,11 +901,13 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) static int tda9887_suspend(struct device * dev, pm_message_t state) -#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#else +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level) #else static int tda9887_suspend(struct device * dev, u32 state, u32 level) #endif +#endif { struct i2c_client *c = container_of(dev, struct i2c_client, dev); struct tda9887 *t = i2c_get_clientdata(c); |