summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-07 12:27:23 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-07 12:27:23 -0300
commitea009cf638aed85a31baef6da2d06ab8b229c1c8 (patch)
treebee3e6aa0610338518b9b95c0ecdf30c9cf8eb94 /linux
parente08fe9b085ccce13ce192a1351c8192f6a6cb60b (diff)
parent836ddab33ea605227fb3ca8beac11ff52396f525 (diff)
downloadmediapointer-dvb-s2-ea009cf638aed85a31baef6da2d06ab8b229c1c8.tar.gz
mediapointer-dvb-s2-ea009cf638aed85a31baef6da2d06ab8b229c1c8.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
index 6ec8e4510..ff6640784 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -122,7 +122,7 @@ struct usb_data_stream_properties {
* @caps: capabilities of the DVB USB device.
* @pid_filter_count: number of PID filter position in the optional hardware
* PID-filter.
- * @streaming_crtl: called to start and stop the MPEG2-TS streaming of the
+ * @streaming_ctrl: called to start and stop the MPEG2-TS streaming of the
* device (not URB submitting/killing).
* @pid_filter_ctrl: called to en/disable the PID filter, if any.
* @pid_filter: called to set/unset a PID for filtering.