diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-17 21:25:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-17 21:25:07 -0300 |
| commit | aa6d98fa9c3ec7360f92a16516e75ed2ede3ebbc (patch) | |
| tree | 393e92e1fc1b5a660c3cb8595be07fd6fe761a87 | |
| parent | 718d0b0d28a8a8bc854fa0d5c350ef35e38d36d0 (diff) | |
| download | mediapointer-dvb-s2-aa6d98fa9c3ec7360f92a16516e75ed2ede3ebbc.tar.gz mediapointer-dvb-s2-aa6d98fa9c3ec7360f92a16516e75ed2ede3ebbc.tar.bz2 | |
Sync with whitespaces on -git
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/dvb/siano/smscoreapi.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7127.c | 5 | ||||
| -rw-r--r-- | linux/include/media/v4l2-i2c-drv-legacy.h | 1 | ||||
| -rw-r--r-- | linux/include/media/v4l2-i2c-drv.h | 1 |
4 files changed, 4 insertions, 4 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 */ diff --git a/linux/include/media/v4l2-i2c-drv-legacy.h b/linux/include/media/v4l2-i2c-drv-legacy.h index 2887c53f7..299b1c344 100644 --- a/linux/include/media/v4l2-i2c-drv-legacy.h +++ b/linux/include/media/v4l2-i2c-drv-legacy.h @@ -128,7 +128,6 @@ static struct i2c_driver v4l2_i2c_driver = { .suspend = v4l2_i2c_drv_suspend_helper, .resume = v4l2_i2c_drv_resume_helper, }; - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) static int compat_legacy_probe(struct i2c_client *client) { diff --git a/linux/include/media/v4l2-i2c-drv.h b/linux/include/media/v4l2-i2c-drv.h index 734035ccf..1feadb6c1 100644 --- a/linux/include/media/v4l2-i2c-drv.h +++ b/linux/include/media/v4l2-i2c-drv.h @@ -45,7 +45,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data; static struct i2c_driver v4l2_i2c_driver; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) static int compat_legacy_probe(struct i2c_client *client) { |