summaryrefslogtreecommitdiff
path: root/linux/Documentation
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-05 07:56:10 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-05 07:56:10 -0300
commitea8dbc7189efcfa7dbfc93f5deca1df176c5a3ef (patch)
tree49934cc102b523b77ef182fe7e13e563f7c7fb5a /linux/Documentation
parent71bde24b27b74e98e8c4a4b253994b5e05ca42bf (diff)
parent81fd2420e39ed720ba99ea0278b6daac6d65d200 (diff)
downloadmediapointer-dvb-s2-ea8dbc7189efcfa7dbfc93f5deca1df176c5a3ef.tar.gz
mediapointer-dvb-s2-ea8dbc7189efcfa7dbfc93f5deca1df176c5a3ef.tar.bz2
merge: http://hg.jannau.net/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation')
-rw-r--r--linux/Documentation/video4linux/v4l2-framework.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/v4l2-framework.txt b/linux/Documentation/video4linux/v4l2-framework.txt
index a31177390..4b54c629b 100644
--- a/linux/Documentation/video4linux/v4l2-framework.txt
+++ b/linux/Documentation/video4linux/v4l2-framework.txt
@@ -90,7 +90,7 @@ up before calling v4l2_device_register then it will be untouched. If dev is
NULL, then you *must* setup v4l2_dev->name before calling v4l2_device_register.
The first 'dev' argument is normally the struct device pointer of a pci_dev,
-usb_device or platform_device. It is rare for dev to be NULL, but it happens
+usb_interface or platform_device. It is rare for dev to be NULL, but it happens
with ISA devices or when one device creates multiple PCI devices, thus making
it impossible to associate v4l2_dev with a particular parent.