r2875 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series

[Andres Salomon]

Author: dilinger
Date: 2005-04-02 03:12:08 +0000 (Sat, 02 Apr 2005)
New Revision: 2875

Added:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-saa7134-update-2.patch
Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2
Log:
  * drivers-media-video-saa7134-update-2.patch:
    Additional saa7134 fix; build as a non-module (Andres Salomon).


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-04-02 01:10:36 UTC (rev 2874)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-04-02 03:12:08 UTC (rev 2875)
@@ -65,6 +65,9 @@
      o Suspected information leak (mem pages) in ext2 [CAN-2005-0400]
    (Andres Salomon).
 
+  * drivers-media-video-saa7134-update-2.patch:
+    Additional saa7134 fix; build as a non-module (Andres Salomon).
+
  -- Simon Horman <horms@debian.org>  Fri,  1 Apr 2005 18:05:25 +0900
 
 kernel-source-2.6.11 (2.6.11-1) unstable; urgency=low

Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-saa7134-update-2.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-saa7134-update-2.patch	2005-04-02 01:10:36 UTC (rev 2874)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/drivers-media-video-saa7134-update-2.patch	2005-04-02 03:12:08 UTC (rev 2875)
@@ -0,0 +1,37 @@
+# origin: akpm@osdl.org (BitKeeper)
+# cset: 4237a995sCGGX1UyT_r47klYjvnkmw
+# URL: http://linux.bkbits.net:8080/linux-2.6/cset@4237a995sCGGX1UyT_r47klYjvnkmw
+# inclusion: upstream (backport)
+# descrition: [PATCH] saa7134 !CONFIG_MODULES build fix
+# revision date: 2005-03-15 19:35:49-08:00
+#
+diff -Naru a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
+--- a/drivers/media/video/saa7134/saa7134-core.c	2005-04-01 19:08:05 -08:00
++++ b/drivers/media/video/saa7134/saa7134-core.c	2005-04-01 19:08:05 -08:00
+@@ -1212,8 +1212,10 @@
+ 
+ static void saa7134_fini(void)
+ {
++#ifdef CONFIG_MODULES
+ 	if (pending_registered)
+ 		unregister_module_notifier(&pending_notifier);
++#endif
+ 	pci_unregister_driver(&saa7134_pci_driver);
+ }
+ 
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/15 19:35:49-08:00 akpm@osdl.org 
+#   [PATCH] saa7134 !CONFIG_MODULES build fix
+#   
+#   drivers/media/video/saa7134/saa7134-core.c: In function `saa7134_fini':
+#   drivers/media/video/saa7134/saa7134-core.c:1215: `pending_registered' undeclared (first use in this function)
+#   
+#   Signed-off-by: Andrew Morton <akpm@osdl.org>
+#   Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+# 
+# drivers/media/video/saa7134/saa7134-core.c
+#   2005/03/15 06:30:26-08:00 akpm@osdl.org +2 -0
+#   saa7134 !CONFIG_MODULES build fix
+# 

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2	2005-04-02 01:10:36 UTC (rev 2874)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-2	2005-04-02 03:12:08 UTC (rev 2875)
@@ -12,3 +12,4 @@
 + arch-ppc64-hugepage-aio-panic.patch
 - patch-2.6.11.5.patch
 + patch-2.6.11.6.patch
++ drivers-media-video-saa7134-update-2.patch