From eb9161bc8dbf2bbb67512c9fe79384a2d13245c4 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 8 Jun 2011 11:34:31 -0300
Subject: [PATCH] --- yaml --- r: 261287 b: refs/heads/master c:
 cde291dfd7df3f7202078afcf27e9bb21ea76d0c h: refs/heads/master i:   261285:
 8754850ba1129e250e2472b826b3010594147e4e   261283:
 ba2e122c7344f973f592ad4b66cc7c255d6333a5   261279:
 435ad55812e63b28ec0997a9e9b1b9e1fa0bdfca v: v3

---
 [refs]                                       |  2 +-
 trunk/Documentation/DocBook/media/dvb/ca.xml | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5fdd0200d12c..802c6fd4645c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b680d1b4e7e0c561d1523d5155212705fcbb10a
+refs/heads/master: cde291dfd7df3f7202078afcf27e9bb21ea76d0c
diff --git a/trunk/Documentation/DocBook/media/dvb/ca.xml b/trunk/Documentation/DocBook/media/dvb/ca.xml
index 143ec5bf6bd3..a6cb9522f289 100644
--- a/trunk/Documentation/DocBook/media/dvb/ca.xml
+++ b/trunk/Documentation/DocBook/media/dvb/ca.xml
@@ -44,7 +44,7 @@ typedef struct ca_descr_info {
 <section id="ca-caps">
 <title>ca_caps_t</title>
 <programlisting>
-typedef struct ca_cap_s {
+typedef struct ca_caps {
 	unsigned int slot_num;  /&#x22C6; total number of CA card and module slots &#x22C6;/
 	unsigned int slot_type; /&#x22C6; OR of all supported types &#x22C6;/
 	unsigned int descr_num; /&#x22C6; total number of descrambler slots (keys) &#x22C6;/
@@ -75,7 +75,18 @@ typedef struct ca_descr {
 	unsigned char cw[8];
 } ca_descr_t;
 </programlisting>
- </section></section>
+</section>
+
+<section id="ca-pid">
+<title>ca-pid</title>
+<programlisting>
+typedef struct ca_pid {
+	unsigned int pid;
+	int index;		/&#x22C6; -1 == disable&#x22C6;/
+} ca_pid_t;
+</programlisting>
+</section></section>
+
 <section id="ca_function_calls">
 <title>CA Function Calls</title>