3 files changed, 3 insertions, 38 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 486638f24b4f..42b95e0ad558 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -211,42 +211,6 @@ Who:	Nick Piggin <npiggin@suse.de>
 
 ---------------------------
 
-What:   Support for the Momentum / PMC-Sierra Jaguar ATX evaluation board
-When:   September 2006
-Why:    Does no longer build since quite some time, and was never popular,
-        due to the platform being replaced by successor models.  Apparently
-        no user base left.  It also is one of the last users of
-        WANT_PAGE_VIRTUAL.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
-What:   Support for the Momentum Ocelot, Ocelot 3, Ocelot C and Ocelot G
-When:   September 2006
-Why:    Some do no longer build and apparently there is no user base left
-        for these platforms.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
-What:   Support for MIPS Technologies' Altas and SEAD evaluation board
-When:   September 2006
-Why:    Some do no longer build and apparently there is no user base left
-        for these platforms.  Hardware out of production since several years.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
-What:   Support for the IT8172-based platforms, ITE 8172G and Globespan IVR
-When:   September 2006
-Why:    Code does no longer build since at least 2.6.0,  apparently there is
-        no user base left for these platforms.  Hardware out of production
-        since several years and hardly a trace of the manufacturer left on
-        the net.
-Who:    Ralf Baechle <ralf@linux-mips.org>
-
----------------------------
-
 What:   Interrupt only SA_* flags
 When:   Januar 2007
 Why:    The interrupt related SA_* flags are replaced by IRQF_* to move them
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 669a09aa5bb4..126e59d935cd 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -16,7 +16,7 @@
  15 -> DViCO FusionHDTV DVB-T1                             [18ac:db00]
  16 -> KWorld LTV883RF
  17 -> DViCO FusionHDTV 3 Gold-Q                           [18ac:d810,18ac:d800]
- 18 -> Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001]
+ 18 -> Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001,0070:9000]
  19 -> Conexant DVB-T reference design                     [14f1:0187]
  20 -> Provideo PV259                                      [1540:2580]
  21 -> DViCO FusionHDTV DVB-T Plus                         [18ac:db10,18ac:db11]
@@ -41,7 +41,7 @@
  40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid                [0070:9400,0070:9402]
  41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]
  42 -> digitalnow DNTV Live! DVB-T Pro                     [1822:0025,1822:0019]
- 43 -> KWorld/VStream XPert DVB-T with cx22702             [17de:08a1]
+ 43 -> KWorld/VStream XPert DVB-T with cx22702             [17de:08a1,12ab:2300]
  44 -> DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50,18ac:db54]
  45 -> KWorld HardwareMpegTV XPert                         [17de:0840]
  46 -> DViCO FusionHDTV DVB-T Hybrid                       [18ac:db40,18ac:db44]
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 94cf695b1378..6fb82ac3bef0 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -97,3 +97,4 @@
  96 -> Medion Md8800 Quadro                     [16be:0007,16be:0008]
  97 -> LifeView FlyDVB-S /Acorp TV134DS         [5168:0300,4e42:0300]
  98 -> Proteus Pro 2309                         [0919:2003]
+ 99 -> AVerMedia TV Hybrid A16AR                [1461:2c00]