diff options
Diffstat (limited to 'linux/drivers/media/video/tda9887.c')
| -rw-r--r-- | linux/drivers/media/video/tda9887.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index e918216ff..841e5d109 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -841,14 +841,14 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg) return 0; } -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) +#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) static int tda9887_suspend(struct device * dev, pm_message_t state, u32 level) #else -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) static int tda9887_suspend(struct device * dev, u32 state, u32 level) #endif -#endif -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) { struct i2c_client *c = container_of(dev, struct i2c_client, dev); struct tda9887 *t = i2c_get_clientdata(c); @@ -857,7 +857,11 @@ static int tda9887_suspend(struct device * dev, u32 state, u32 level) return 0; } +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,14) +static int tda9887_resume(struct device * dev) +#else static int tda9887_resume(struct device * dev, u32 level) +#endif { struct i2c_client *c = container_of(dev, struct i2c_client, dev); struct tda9887 *t = i2c_get_clientdata(c); @@ -867,6 +871,7 @@ static int tda9887_resume(struct device * dev, u32 level) return 0; } #endif + /* ----------------------------------------------------------------------- */ static struct i2c_driver driver = { |