diff options
Diffstat (limited to 'linux/drivers/media/video/msp3400.c')
| -rw-r--r-- | linux/drivers/media/video/msp3400.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index cc0c3caf8..1f5f50a05 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -1591,9 +1591,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int msp_suspend(struct device * dev, pm_message_t state, u32 level); -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +#else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) static int msp_suspend(struct device * dev, u32 state, u32 level); #endif +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) static int msp_resume(struct device * dev, u32 level); #endif @@ -2259,9 +2261,11 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int msp_suspend(struct device * dev, pm_message_t state, u32 level) -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +#else +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) static int msp_suspend(struct device * dev, u32 state, u32 level) #endif +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) { struct i2c_client *client = container_of(dev, struct i2c_client, dev); |