diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-06 17:01:47 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-11-06 17:01:47 +0000 |
| commit | 67955ab4a9237e2875812740168d105b0989a17d (patch) | |
| tree | 7166e6bf0bbc91cc8427e3f7747b462a6aeb4889 /linux/drivers/media/video/msp3400-driver.c | |
| parent | fbe7d42cc40bee7179ab9ba05959b2b3374acf08 (diff) | |
| download | mediapointer-dvb-s2-67955ab4a9237e2875812740168d105b0989a17d.tar.gz mediapointer-dvb-s2-67955ab4a9237e2875812740168d105b0989a17d.tar.bz2 | |
- #elsif removed, since it breaks gentree stuff.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/msp3400-driver.c')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index cc0c3caf8..1f5f50a05 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.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); |