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

[maximilian attems]

Author: maks-guest
Date: 2005-01-27 01:11:08 +0100 (Thu, 27 Jan 2005)
New Revision: 2422

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:
set CONFIG_DVB_AV7110_OSD as in 2.6.8


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-27 00:02:37 UTC (rev 2421)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386	2005-01-27 00:11:08 UTC (rev 2422)
@@ -2117,7 +2117,7 @@
 # Supported SAA7146 based PCI Adapters
 #
 CONFIG_DVB_AV7110=m
-# CONFIG_DVB_AV7110_OSD is not set
+CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=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-27 00:02:37 UTC (rev 2421)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686	2005-01-27 00:11:08 UTC (rev 2422)
@@ -2097,7 +2097,7 @@
 # Supported SAA7146 based PCI Adapters
 #
 CONFIG_DVB_AV7110=m
-# CONFIG_DVB_AV7110_OSD is not set
+CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=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-27 00:02:37 UTC (rev 2421)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp	2005-01-27 00:11:08 UTC (rev 2422)
@@ -2071,7 +2071,7 @@
 # Supported SAA7146 based PCI Adapters
 #
 CONFIG_DVB_AV7110=m
-# CONFIG_DVB_AV7110_OSD is not set
+CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=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-27 00:02:37 UTC (rev 2421)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7	2005-01-27 00:11:08 UTC (rev 2422)
@@ -2098,7 +2098,7 @@
 # Supported SAA7146 based PCI Adapters
 #
 CONFIG_DVB_AV7110=m
-# CONFIG_DVB_AV7110_OSD is not set
+CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=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-27 00:02:37 UTC (rev 2421)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp	2005-01-27 00:11:08 UTC (rev 2422)
@@ -2072,7 +2072,7 @@
 # Supported SAA7146 based PCI Adapters
 #
 CONFIG_DVB_AV7110=m
-# CONFIG_DVB_AV7110_OSD is not set
+CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=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-27 00:02:37 UTC (rev 2421)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog	2005-01-27 00:11:08 UTC (rev 2422)
@@ -1,6 +1,7 @@
 kernel-image-2.6.10-i386 (2.6.10-5) unstable; urgency=low
 
   * Disable CONFIG_PREEMPT (Closes: #292061) (Maximilian Attems)
+  * Set CONFIG_DVB_AV7110_OSD (Closes: #291689) (Maximilian Attems)
 
  --