r2151 - in trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10: config debian

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-07 10:17:13 +0100 (Fri, 07 Jan 2005)
New Revision: 2151

Modified:
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog
Log:
 * Disable CONFIG_VIDEO_CX88_DVB for now; doesn't build, and I'm lazy.


Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386	2005-01-07 08:28:43 UTC (rev 2150)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386	2005-01-07 09:17:13 UTC (rev 2151)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10
-# Fri Jan  7 02:39:32 2005
+# Fri Jan  7 04:19:33 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -2083,7 +2083,7 @@
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_DVB=m
+# CONFIG_VIDEO_CX88_DVB is not set
 CONFIG_VIDEO_OVCAMCHIP=m
 
 #
@@ -2189,7 +2189,6 @@
 CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_IR=m
 

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686	2005-01-07 08:28:43 UTC (rev 2150)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686	2005-01-07 09:17:13 UTC (rev 2151)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10
-# Fri Jan  7 02:39:32 2005
+# Fri Jan  7 04:19:35 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -2063,7 +2063,7 @@
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_DVB=m
+# CONFIG_VIDEO_CX88_DVB is not set
 CONFIG_VIDEO_OVCAMCHIP=m
 
 #
@@ -2169,7 +2169,6 @@
 CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_IR=m
 

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp	2005-01-07 08:28:43 UTC (rev 2150)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp	2005-01-07 09:17:13 UTC (rev 2151)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10
-# Fri Jan  7 02:42:17 2005
+# Fri Jan  7 04:19:37 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -2037,7 +2037,7 @@
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_DVB=m
+# CONFIG_VIDEO_CX88_DVB is not set
 CONFIG_VIDEO_OVCAMCHIP=m
 
 #
@@ -2143,7 +2143,6 @@
 CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_IR=m
 

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7	2005-01-07 08:28:43 UTC (rev 2150)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7	2005-01-07 09:17:13 UTC (rev 2151)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10
-# Fri Jan  7 02:45:30 2005
+# Fri Jan  7 04:19:39 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -2064,7 +2064,7 @@
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_DVB=m
+# CONFIG_VIDEO_CX88_DVB is not set
 CONFIG_VIDEO_OVCAMCHIP=m
 
 #
@@ -2170,7 +2170,6 @@
 CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_IR=m
 

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp	2005-01-07 08:28:43 UTC (rev 2150)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp	2005-01-07 09:17:13 UTC (rev 2151)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.10
-# Fri Jan  7 02:53:05 2005
+# Fri Jan  7 04:19:41 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -2038,7 +2038,7 @@
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_DVB=m
+# CONFIG_VIDEO_CX88_DVB is not set
 CONFIG_VIDEO_OVCAMCHIP=m
 
 #
@@ -2144,7 +2144,6 @@
 CONFIG_VIDEO_VIDEOBUF=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BUF_DVB=m
 CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_IR=m
 

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog	2005-01-07 08:28:43 UTC (rev 2150)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog	2005-01-07 09:17:13 UTC (rev 2151)
@@ -3,6 +3,7 @@
   * New upstream release.
   * Build against 2.6.10-1.
   * Make images build-dep against initrd-tools >= 1.0.76.
+  * Disable CONFIG_VIDEO_CX88_DVB for now; doesn't build, and I'm lazy.
 
  -- Andres Salomon <dilinger@voxel.net>  Fri, 07 Jan 2005 01:46:31 -0500