aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-27 12:27:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 08:17:19 -0200
commit66832aef0694807f487a8ccc8871cea4e80d78c5 (patch)
tree0f725c8421c73925e1c59faf26253dc17a585c5e
parentb9218f2f15cdff8991ba041993bf40962c49fdd0 (diff)
downloadkernel_samsung_aries-66832aef0694807f487a8ccc8871cea4e80d78c5.zip
kernel_samsung_aries-66832aef0694807f487a8ccc8871cea4e80d78c5.tar.gz
kernel_samsung_aries-66832aef0694807f487a8ccc8871cea4e80d78c5.tar.bz2
[media] bt819: the ioctls in the header are internal to the kernel
Remove bt819.h from ioctl-number.txt and make a note in the header that these ioctls are for internal use only. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/ioctl/ioctl-number.txt1
-rw-r--r--include/media/bt819.h5
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 7edf950..d6a63c7 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -193,7 +193,6 @@ Code Seq#(hex) Include File Comments
<http://lrcwww.epfl.ch/>
'b' 00-FF conflict! bit3 vme host bridge
<mailto:natalia@nikhefk.nikhef.nl>
-'b' 00-0F media/bt819.h conflict!
'c' all linux/cm4000_cs.h conflict!
'c' 00-7F linux/comstats.h conflict!
'c' 00-7F linux/coda.h conflict!
diff --git a/include/media/bt819.h b/include/media/bt819.h
index 38f666b..8025f4b 100644
--- a/include/media/bt819.h
+++ b/include/media/bt819.h
@@ -26,7 +26,10 @@
/* v4l2_device notifications. */
/* Needed to reset the FIFO buffer when changing the input
- or the video standard. */
+ or the video standard.
+
+ Note: these ioctls that internal to the kernel and are never called
+ from userspace. */
#define BT819_FIFO_RESET_LOW _IO('b', 0)
#define BT819_FIFO_RESET_HIGH _IO('b', 1)