diff options
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-reg.h | 4 | ||||
| -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 | ||||
| -rw-r--r-- | v4l/ChangeLog | 11 |
5 files changed, 23 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-reg.h b/linux/drivers/media/dvb/b2c2/flexcop-reg.h index 23cc6431e..3153f9513 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-reg.h +++ b/linux/drivers/media/dvb/b2c2/flexcop-reg.h @@ -39,11 +39,13 @@ extern const char *flexcop_device_names[]; /* FlexCop IBI Registers */ #if defined(__LITTLE_ENDIAN) #include "flexcop_ibi_value_le.h" -#elif defined(__BIG_ENDIAN) +#else +#if defined(__BIG_ENDIAN) #include "flexcop_ibi_value_be.h" #else #error no endian defined #endif +#endif #define fc_data_Tag_ID_DVB 0x3e #define fc_data_Tag_ID_ATSC 0x3f 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); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b4750fcc5..f9a3c1403 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-12-07 17:29 mchehab + + * linux/drivers/media/dvb/b2c2/flexcop-reg.h: + * linux/drivers/media/video/msp3400.c: + * linux/drivers/media/video/tda9887.c: (tda9887_suspend): + + - #elifs replaced since gentree.pl script is not able + to handle elifs. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-07 15:27 mchehab * linux/drivers/media/video/bttv-driver.c: |