diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-29 06:49:26 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-29 06:49:26 -0300 |
| commit | 1aaedcfcedc4290350ffe058a6f1e7af9319ff3c (patch) | |
| tree | 29fa4f815789d7a7dd28786d7fe1f37bd5e2eb31 /linux/drivers/media | |
| parent | 65184f180c64c20423ffcc881e39fc645d8a3afd (diff) | |
| download | mediapointer-dvb-s2-1aaedcfcedc4290350ffe058a6f1e7af9319ff3c.tar.gz mediapointer-dvb-s2-1aaedcfcedc4290350ffe058a6f1e7af9319ff3c.tar.bz2 | |
Fix whitespace diffs between -git and mercurial
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/common/ir-keymaps.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-cards.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/common/ir-keymaps.c b/linux/drivers/media/common/ir-keymaps.c index 09ad649ec..a464ad34e 100644 --- a/linux/drivers/media/common/ir-keymaps.c +++ b/linux/drivers/media/common/ir-keymaps.c @@ -2289,4 +2289,3 @@ IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE] = { [0x2a] = KEY_MENU, }; EXPORT_SYMBOL_GPL(ir_codes_avermedia_a16d); - diff --git a/linux/drivers/media/video/cx18/cx18-cards.h b/linux/drivers/media/video/cx18/cx18-cards.h index 26ac41de2..dc283d756 100644 --- a/linux/drivers/media/video/cx18/cx18-cards.h +++ b/linux/drivers/media/video/cx18/cx18-cards.h @@ -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 --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index cfe8b2a79..8c74621db 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -413,8 +413,8 @@ static ssize_t show_dev(struct class_device *cd, char *buf) } static DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL); -#endif +#endif struct video_device *video_device_alloc(void) { struct video_device *vfd; |