The patch number 8432 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]>
Some few kernel syncs: update i2c-id.h and cleans whitespace on a Kconfig file
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/Kconfig | 4 ++--
linux/include/linux/i2c-id.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff -r a99bafdac5a7 -r 527f3e1f973c linux/drivers/media/video/Kconfig
--- a/linux/drivers/media/video/Kconfig Sun Jul 20 09:36:07 2008 -0300
+++ b/linux/drivers/media/video/Kconfig Sun Jul 20 09:39:24 2008 -0300
@@ -641,8 +641,8 @@ config VIDEO_ZORAN_ZR36060
depends on VIDEO_ZORAN
help
Say Y to support Zoran boards based on 36060 chips.
- This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33
- and 33 R10 and AverMedia 6 boards.
+ This includes Iomega Bus, Pinnacle DC10, Linux media Labs 33
+ and 33 R10 and AverMedia 6 boards.
config VIDEO_ZORAN_BUZ
tristate "Iomega Buz support"
diff -r a99bafdac5a7 -r 527f3e1f973c linux/include/linux/i2c-id.h
--- a/linux/include/linux/i2c-id.h Sun Jul 20 09:36:07 2008 -0300
+++ b/linux/include/linux/i2c-id.h Sun Jul 20 09:39:24 2008 -0300
@@ -84,8 +84,6 @@
#define I2C_DRIVERID_M52790 95 /* Mitsubishi M52790SP/FP AV switch */
#define I2C_DRIVERID_CS5345 96 /* cs5345 audio processor */
-#define I2C_DRIVERID_I2CDEV 900
-
#define I2C_DRIVERID_OV7670 1048 /* Omnivision 7670 camera */
/*
@@ -104,7 +102,6 @@
#define I2C_HW_B_RIVA 0x010010 /* Riva based graphics cards */
#define I2C_HW_B_IOC 0x010011 /* IOC bit-wiggling */
#define I2C_HW_B_IXP2000 0x010016 /* GPIO on IXP2000 systems */
-#define I2C_HW_B_S3VIA 0x010018 /* S3Via ProSavage adapter */
#define I2C_HW_B_ZR36067 0x010019 /* Zoran-36057/36067 based boards */
#define I2C_HW_B_PCILYNX 0x01001a /* TI PCILynx I2C adapter */
#define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/527f3e1f973c187c5c00340490dfd4808c276c5c
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
