The patch number 8145 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]>
Fix whitespace diffs between -git and mercurial
Kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/common/ir-keymaps.c | 1 -
linux/drivers/media/video/cx18/cx18-cards.h | 2 +-
linux/drivers/media/video/videodev.c | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff -r 196be6985dba -r 9a947bb6b25c linux/drivers/media/common/ir-keymaps.c
--- a/linux/drivers/media/common/ir-keymaps.c Sun Jun 29 06:03:11 2008 -0300
+++ b/linux/drivers/media/common/ir-keymaps.c Sun Jun 29 06:49:26 2008 -0300
@@ -2289,4 +2289,3 @@ IR_KEYTAB_TYPE ir_codes_avermedia_a16d[I
[0x2a] = KEY_MENU,
};
EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d);
-
diff -r 196be6985dba -r 9a947bb6b25c linux/drivers/media/video/cx18/cx18-cards.h
--- a/linux/drivers/media/video/cx18/cx18-cards.h Sun Jun 29 06:03:11
2008 -0300
+++ b/linux/drivers/media/video/cx18/cx18-cards.h Sun Jun 29 06:49:26
2008 -0300
@@ -130,7 +130,7 @@ struct cx18_card {
u8 xceive_pin; /* XCeive tuner GPIO reset pin */
struct cx18_gpio_init gpio_init;
struct cx18_gpio_i2c_slave_reset gpio_i2c_slave_reset;
- struct cx18_gpio_audio_input gpio_audio_input;
+ struct cx18_gpio_audio_input gpio_audio_input;
struct cx18_card_tuner tuners[CX18_CARD_MAX_TUNERS];
struct cx18_card_tuner_i2c *i2c;
diff -r 196be6985dba -r 9a947bb6b25c linux/drivers/media/video/videodev.c
--- a/linux/drivers/media/video/videodev.c Sun Jun 29 06:03:11 2008 -0300
+++ b/linux/drivers/media/video/videodev.c Sun Jun 29 06:49:26 2008 -0300
@@ -413,8 +413,8 @@ static ssize_t show_dev(struct class_dev
}
static DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
-#endif
-
+
+#endif
struct video_device *video_device_alloc(void)
{
struct video_device *vfd;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/9a947bb6b25caf4d5743abe0240477b7aa9b3297
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
