aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-audio.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c1
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-i2c-track.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-tuner.c1
5 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index cdedaa55f152..6159c7e3047d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -35,6 +35,7 @@ struct pvr2_msp3400_handler {
35 35
36 36
37 37
38
38struct routing_scheme { 39struct routing_scheme {
39 const int *def; 40 const int *def;
40 unsigned int cnt; 41 unsigned int cnt;
@@ -180,6 +181,7 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
180} 181}
181 182
182 183
184
183/* 185/*
184 Stuff for Emacs to see, in order to encourage consistent editing style: 186 Stuff for Emacs to see, in order to encourage consistent editing style:
185 *** Local Variables: *** 187 *** Local Variables: ***
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
index 895859ec495a..9494c6a5b5d8 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c
@@ -323,6 +323,7 @@ int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw,
323 323
324 324
325 325
326
326/* 327/*
327 Stuff for Emacs to see, in order to encourage consistent editing style: 328 Stuff for Emacs to see, in order to encourage consistent editing style:
328 *** Local Variables: *** 329 *** Local Variables: ***
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 8f32c2edb49a..7e0628b988cc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -29,6 +29,7 @@
29#include "pvrusb2-cx2584x-v4l.h" 29#include "pvrusb2-cx2584x-v4l.h"
30#include "pvrusb2-wm8775.h" 30#include "pvrusb2-wm8775.h"
31 31
32
32#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) 33#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
33 34
34#define OP_INIT 0 /* MUST come first so it is run first */ 35#define OP_INIT 0 /* MUST come first so it is run first */
@@ -105,6 +106,7 @@ const struct pvr2_i2c_op *pvr2_i2c_get_op(unsigned int idx)
105} 106}
106 107
107 108
109
108/* 110/*
109 Stuff for Emacs to see, in order to encourage consistent editing style: 111 Stuff for Emacs to see, in order to encourage consistent editing style:
110 *** Local Variables: *** 112 *** Local Variables: ***
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c
index 48cffa4a1b6a..4bb6f9453e0d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-track.c
@@ -26,6 +26,7 @@
26 26
27#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) 27#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
28 28
29
29/* 30/*
30 31
31 This module implements the foundation of a rather large architecture for 32 This module implements the foundation of a rather large architecture for
@@ -469,6 +470,7 @@ void pvr2_i2c_track_done(struct pvr2_hdw *hdw)
469 /* Empty for now */ 470 /* Empty for now */
470} 471}
471 472
473
472/* 474/*
473 Stuff for Emacs to see, in order to encourage consistent editing style: 475 Stuff for Emacs to see, in order to encourage consistent editing style:
474 *** Local Variables: *** 476 *** Local Variables: ***
diff --git a/drivers/media/video/pvrusb2/pvrusb2-tuner.c b/drivers/media/video/pvrusb2/pvrusb2-tuner.c
index 07775d1aad4e..ee9c9c139a85 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-tuner.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-tuner.c
@@ -28,6 +28,7 @@
28#include <media/tuner.h> 28#include <media/tuner.h>
29#include <media/v4l2-common.h> 29#include <media/v4l2-common.h>
30 30
31
31struct pvr2_tuner_handler { 32struct pvr2_tuner_handler {
32 struct pvr2_hdw *hdw; 33 struct pvr2_hdw *hdw;
33 struct pvr2_i2c_client *client; 34 struct pvr2_i2c_client *client;