diff options
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7127.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/siano/smscoreapi.h b/linux/drivers/media/dvb/siano/smscoreapi.h index 482ef0676..dbedc315f 100644 --- a/linux/drivers/media/dvb/siano/smscoreapi.h +++ b/linux/drivers/media/dvb/siano/smscoreapi.h @@ -29,6 +29,7 @@ #include <linux/scatterlist.h> #include <linux/types.h> #include <asm/page.h> + #include "compat.h" #include "dmxdev.h" #include "dvbdev.h" diff --git a/linux/drivers/media/video/saa7127.c b/linux/drivers/media/video/saa7127.c index ca88dd325..0b126a849 100644 --- a/linux/drivers/media/video/saa7127.c +++ b/linux/drivers/media/video/saa7127.c @@ -722,9 +722,10 @@ static int saa7127_probe(struct i2c_client *client, #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) if (id->driver_data) { /* Chip type is already known */ state->ident = id->driver_data; - } else /* Needs detection */ -#endif + } else { /* Needs detection */ +#else { +#endif int read_result; /* Detect if it's an saa7129 */ |