From 71e482bf2a2059ed7e7429a67e9b041c4dec3b83 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 27 Dec 2010 12:27:50 -0300 Subject: [PATCH] --- yaml --- r: 226379 b: refs/heads/master c: 66832aef0694807f487a8ccc8871cea4e80d78c5 h: refs/heads/master i: 226377: 374f179016cd442e7f0aa88c8981cbdad6f9fa93 226375: a58e66d387c130d3adede0976c1d7196dd2c937a v: v3 --- [refs] | 2 +- trunk/Documentation/ioctl/ioctl-number.txt | 1 - trunk/include/media/bt819.h | 5 ++++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index adccec6d6ed1..058177813c70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9218f2f15cdff8991ba041993bf40962c49fdd0 +refs/heads/master: 66832aef0694807f487a8ccc8871cea4e80d78c5 diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt index 7edf95014e85..d6a63c7b4478 100644 --- a/trunk/Documentation/ioctl/ioctl-number.txt +++ b/trunk/Documentation/ioctl/ioctl-number.txt @@ -193,7 +193,6 @@ Code Seq#(hex) Include File Comments 'b' 00-FF conflict! bit3 vme host bridge -'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/trunk/include/media/bt819.h b/trunk/include/media/bt819.h index 38f666bde77a..8025f4bc2bb6 100644 --- a/trunk/include/media/bt819.h +++ b/trunk/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)