The patch number 8399 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
Sync with whitespaces on -git
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/siano/smscoreapi.h | 1 +
linux/drivers/media/video/saa7127.c | 5 +++--
linux/include/media/v4l2-i2c-drv-legacy.h | 1 -
linux/include/media/v4l2-i2c-drv.h | 1 -
4 files changed, 4 insertions(+), 4 deletions(-)
diff -r dc94c340fef7 -r 03cf7423cbc1 linux/drivers/media/dvb/siano/smscoreapi.h
--- a/linux/drivers/media/dvb/siano/smscoreapi.h Thu Jul 17 19:56:40
2008 -0300
+++ b/linux/drivers/media/dvb/siano/smscoreapi.h Thu Jul 17 21:25:07
2008 -0300
@@ -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 -r dc94c340fef7 -r 03cf7423cbc1 linux/drivers/media/video/saa7127.c
--- a/linux/drivers/media/video/saa7127.c Thu Jul 17 19:56:40 2008 -0300
+++ b/linux/drivers/media/video/saa7127.c Thu Jul 17 21:25:07 2008 -0300
@@ -722,9 +722,10 @@ static int saa7127_probe(struct i2c_clie
#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 */
+ } else { /* Needs detection */
+#else
+ {
#endif
- {
int read_result;
/* Detect if it's an saa7129 */
diff -r dc94c340fef7 -r 03cf7423cbc1 linux/include/media/v4l2-i2c-drv-legacy.h
--- a/linux/include/media/v4l2-i2c-drv-legacy.h Thu Jul 17 19:56:40 2008 -0300
+++ b/linux/include/media/v4l2-i2c-drv-legacy.h Thu Jul 17 21:25:07 2008 -0300
@@ -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 -r dc94c340fef7 -r 03cf7423cbc1 linux/include/media/v4l2-i2c-drv.h
--- a/linux/include/media/v4l2-i2c-drv.h Thu Jul 17 19:56:40 2008 -0300
+++ b/linux/include/media/v4l2-i2c-drv.h Thu Jul 17 21:25:07 2008 -0300
@@ -45,7 +45,6 @@ static struct i2c_driver v4l2_i2c_driver
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)
{
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/03cf7423cbc1ea66961a6d69f68d838b909f98db
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
