The patch number 7860 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]>
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/mt9m001.c | 5 +----
linux/drivers/media/video/mt9v022.c | 7 ++-----
2 files changed, 3 insertions(+), 9 deletions(-)
diff -r 74620b840e12 -r 0a072dd11cd8 linux/drivers/media/video/mt9m001.c
--- a/linux/drivers/media/video/mt9m001.c Mon Apr 28 15:39:09 2008 +0000
+++ b/linux/drivers/media/video/mt9m001.c Wed May 07 15:42:54 2008 -0300
@@ -12,14 +12,11 @@
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/log2.h>
+#include <linux/gpio.h>
#include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h>
#include <media/soc_camera.h>
-
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include <asm/gpio.h>
-#endif
/* mt9m001 i2c address 0x5d
* The platform has to define i2c_board_info
diff -r 74620b840e12 -r 0a072dd11cd8 linux/drivers/media/video/mt9v022.c
--- a/linux/drivers/media/video/mt9v022.c Mon Apr 28 15:39:09 2008 +0000
+++ b/linux/drivers/media/video/mt9v022.c Wed May 07 15:42:54 2008 -0300
@@ -13,14 +13,11 @@
#include <linux/i2c.h>
#include <linux/delay.h>
#include <linux/log2.h>
+#include <linux/gpio.h>
#include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h>
#include <media/soc_camera.h>
-
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include <asm/gpio.h>
-#endif
/* mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
* The platform has to define i2c_board_info
@@ -91,7 +88,7 @@ struct mt9v022 {
struct mt9v022 {
struct i2c_client *client;
struct soc_camera_device icd;
- int model; /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
+ int model; /* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */
int switch_gpio;
u16 chip_control;
unsigned char datawidth;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/0a072dd11cd82af302e061fb40494285d8534915
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
