summaryrefslogtreecommitdiff
path: root/linux/include/media/tuner.h
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-09-25 08:37:12 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2008-09-25 08:37:12 -0400
commit7e39de54b4ed06bb2ababbe72b16f195d796d8f0 (patch)
tree5a74da414f5b1aaa78712988a989a00a94736648 /linux/include/media/tuner.h
parent968c43076f37c9f65df65fe50a1c643a82b1192b (diff)
parent9385e4874ef72f62d77800fe2eb47429d0854125 (diff)
downloadmediapointer-dvb-s2-7e39de54b4ed06bb2ababbe72b16f195d796d8f0.tar.gz
mediapointer-dvb-s2-7e39de54b4ed06bb2ababbe72b16f195d796d8f0.tar.bz2
merge: ~pb/v4l-dvb
From: Michael Krufky <mkrufky@linuxtv.org> Priority: normal Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/include/media/tuner.h')
-rw-r--r--linux/include/media/tuner.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index ba818985c..67c1f514d 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -179,7 +179,7 @@ struct tuner_setup {
unsigned int type; /* Tuner type */
unsigned int mode_mask; /* Allowed tuner modes */
unsigned int config; /* configuraion for more complex tuners */
- int (*tuner_callback) (void *dev, int command,int arg);
+ int (*tuner_callback) (void *dev, int component, int cmd, int arg);
};
#endif /* __KERNEL__ */