r2883 - in trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11: config debian
Andres Salomon
dilinger@costa.debian.org
Sun, 03 Apr 2005 02:06:38 +0000
Author: dilinger
Date: 2005-04-03 02:06:36 +0000 (Sun, 03 Apr 2005)
New Revision: 2883
Modified:
trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/386
trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686
trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp
trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/default
trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7
trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp
trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog
Log:
enable a few more DVB drivers, re-enable saa7134
Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/386
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/386 2005-04-03 01:54:23 UTC (rev 2882)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/386 2005-04-03 02:06:36 UTC (rev 2883)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11
-# Tue Mar 29 19:09:51 2005
+# Sat Apr 2 21:02:55 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -699,7 +699,6 @@
CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLOGIC_1280_1040=y
-CONFIG_SCSI_QLA2XXX=m
# CONFIG_SCSI_SEAGATE is not set
CONFIG_SCSI_SIM710=m
CONFIG_SCSI_SYM53C416=m
@@ -2087,16 +2086,16 @@
CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
-# CONFIG_VIDEO_ZR36120 is not set
+CONFIG_VIDEO_ZR36120=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
-# CONFIG_VIDEO_CX88_DVB is not set
+CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_OVCAMCHIP=m
#
@@ -2207,6 +2206,7 @@
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
CONFIG_VIDEO_TVEEPROM=m
Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686 2005-04-03 01:54:23 UTC (rev 2882)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686 2005-04-03 02:06:36 UTC (rev 2883)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11
-# Tue Mar 29 19:09:53 2005
+# Sat Apr 2 21:03:32 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -690,7 +690,6 @@
CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLOGIC_1280_1040=y
-CONFIG_SCSI_QLA2XXX=m
# CONFIG_SCSI_SEAGATE is not set
CONFIG_SCSI_SYM53C416=m
CONFIG_SCSI_DC395x=m
@@ -2066,16 +2065,16 @@
CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
-# CONFIG_VIDEO_ZR36120 is not set
+CONFIG_VIDEO_ZR36120=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
-# CONFIG_VIDEO_CX88_DVB is not set
+CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_OVCAMCHIP=m
#
@@ -2186,6 +2185,7 @@
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
CONFIG_VIDEO_TVEEPROM=m
Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp 2005-04-03 01:54:23 UTC (rev 2882)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/686-smp 2005-04-03 02:06:36 UTC (rev 2883)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11
-# Tue Mar 29 19:09:55 2005
+# Sat Apr 2 21:04:10 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -693,7 +693,6 @@
CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLOGIC_1280_1040=y
-CONFIG_SCSI_QLA2XXX=m
# CONFIG_SCSI_SEAGATE is not set
CONFIG_SCSI_SYM53C416=m
CONFIG_SCSI_DC395x=m
@@ -2041,16 +2040,16 @@
CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
-# CONFIG_VIDEO_ZR36120 is not set
+CONFIG_VIDEO_ZR36120=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
-# CONFIG_VIDEO_CX88_DVB is not set
+CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_OVCAMCHIP=m
#
@@ -2161,6 +2160,7 @@
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
CONFIG_VIDEO_TVEEPROM=m
Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/default
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/default 2005-04-03 01:54:23 UTC (rev 2882)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/default 2005-04-03 02:06:36 UTC (rev 2883)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11
-# Tue Mar 29 19:09:56 2005
+# Sat Apr 2 21:06:25 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -446,7 +446,6 @@
# CONFIG_SCSI_QLOGIC_ISP is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=y
# CONFIG_SCSI_SEAGATE is not set
# CONFIG_SCSI_SYM53C416 is not set
# CONFIG_SCSI_DC395x is not set
Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7 2005-04-03 01:54:23 UTC (rev 2882)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7 2005-04-03 02:06:36 UTC (rev 2883)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11
-# Tue Mar 29 19:09:58 2005
+# Sat Apr 2 21:06:58 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -691,7 +691,6 @@
CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLOGIC_1280_1040=y
-CONFIG_SCSI_QLA2XXX=m
# CONFIG_SCSI_SEAGATE is not set
CONFIG_SCSI_SYM53C416=m
CONFIG_SCSI_DC395x=m
@@ -2067,16 +2066,16 @@
CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
-# CONFIG_VIDEO_ZR36120 is not set
+CONFIG_VIDEO_ZR36120=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
-# CONFIG_VIDEO_CX88_DVB is not set
+CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_OVCAMCHIP=m
#
@@ -2187,6 +2186,7 @@
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
CONFIG_VIDEO_TVEEPROM=m
Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp 2005-04-03 01:54:23 UTC (rev 2882)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/config/k7-smp 2005-04-03 02:06:36 UTC (rev 2883)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11
-# Tue Mar 29 19:09:59 2005
+# Sat Apr 2 21:07:22 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -694,7 +694,6 @@
CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
CONFIG_SCSI_QLOGIC_1280=m
CONFIG_SCSI_QLOGIC_1280_1040=y
-CONFIG_SCSI_QLA2XXX=m
# CONFIG_SCSI_SEAGATE is not set
CONFIG_SCSI_SYM53C416=m
CONFIG_SCSI_DC395x=m
@@ -2042,16 +2041,16 @@
CONFIG_VIDEO_ZORAN_DC30=m
CONFIG_VIDEO_ZORAN_LML33=m
CONFIG_VIDEO_ZORAN_LML33R10=m
-# CONFIG_VIDEO_ZR36120 is not set
+CONFIG_VIDEO_ZR36120=m
CONFIG_VIDEO_MEYE=m
CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_SAA7134_DVB=m
CONFIG_VIDEO_MXB=m
CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
-# CONFIG_VIDEO_CX88_DVB is not set
+CONFIG_VIDEO_CX88_DVB=m
CONFIG_VIDEO_OVCAMCHIP=m
#
@@ -2162,6 +2161,7 @@
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
CONFIG_VIDEO_TVEEPROM=m
Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog 2005-04-03 01:54:23 UTC (rev 2882)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog 2005-04-03 02:06:36 UTC (rev 2883)
@@ -11,6 +11,7 @@
packages to build-dep upon (Andres Salomon)
* Mention the removal of the tg3 driver in NEWS.Debian (Andres Salomon).
* Disable CONFIG_PREEMPT (Andres Salomon).
+ * Enable a few more DVB drivers (Andres Salomon).
-- Andres Salomon <dilinger@debian.org>