r4435 - in dists/sid/linux-2.6/debian: . arch/i386

[Jurij Smakov]

Author: jurij-guest
Date: 2005-10-13 03:31:00 +0000 (Thu, 13 Oct 2005)
New Revision: 4435

Modified:
   dists/sid/linux-2.6/debian/arch/i386/config
   dists/sid/linux-2.6/debian/changelog
Log:
Enable VIDEO_CX88 and VIDEO_CX88_DVB to take
care of 328513/330916. Not adding 'closes:' as
they are going to be closed by 2.6.13 upload.


Modified: dists/sid/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config	2005-10-13 03:18:21 UTC (rev 4434)
+++ dists/sid/linux-2.6/debian/arch/i386/config	2005-10-13 03:31:00 UTC (rev 4435)
@@ -1366,7 +1366,6 @@
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
-# CONFIG_VIDEO_CX88 is not set
 CONFIG_VIDEO_OVCAMCHIP=m
 CONFIG_RADIO_CADET=m
 CONFIG_RADIO_RTRACK=m
@@ -2042,3 +2041,6 @@
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_X86_BIOS_REBOOT=y
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_SCSI_QLA2XXX=n
+CONFIG_VIDEO_CX88=m

Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-10-13 03:18:21 UTC (rev 4434)
+++ dists/sid/linux-2.6/debian/changelog	2005-10-13 03:31:00 UTC (rev 4435)
@@ -32,6 +32,9 @@
   [ Kyle McMartin ]
   * [hppa] Oops. Fix linux-headers not including asm-parisc by adding
     headers_dirs = parisc to Makefile.inc.
+  
+  [ Jurij Smakov ]
+  * [i386] Enable VIDEO_CX88 and VIDEO_CX88_DVB config options.
 
  -- Simon Horman <horms at debian.org>  Tue, 11 Oct 2005 19:48:50 +0900