diff --git a/[refs] b/[refs] index 0cf5001896ea..41daafa12a3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62b122aba1ed96e2d4c7905bcf19fc8caf73dcd6 +refs/heads/master: fc27f04698275ed28e64ba615e60e4d716a11e42 diff --git a/trunk/Documentation/DocBook/v4l/common.xml b/trunk/Documentation/DocBook/v4l/common.xml index d6744b77e591..b1a81d246d58 100644 --- a/trunk/Documentation/DocBook/v4l/common.xml +++ b/trunk/Documentation/DocBook/v4l/common.xml @@ -506,15 +506,6 @@ are used for TV and radio devices alike. Drivers must support both ioctls when the tuner or modulator ioctls are supported, or when the device is a radio device. - -
- Satellite Receivers - - To be discussed. See also -proposals by Peter Schlaf, video4linux-list@redhat.com on 23 Oct 2002, -subject: "Re: [V4L] Re: v4l2 api". -