[patch] 2.6.12-mm1: saa7134-core.c compile error

[Adrian Bunk <bunk@stusta.de>]

On Sun, Jun 19, 2005 at 11:30:29PM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.12-rc6-mm1:
>...
> +v4l-update-for-saa7134-cards.patch
>...
>  v4l updates
>...

The bogus saa7134-core.c part of this patch has to be dropped since it 
causes the following compile error with CONFIG_MODULES=n:

<--  snip  -->

...
  CC      drivers/media/video/saa7134/saa7134-core.o
drivers/media/video/saa7134/saa7134-core.c: In function `saa7134_fini':
drivers/media/video/saa7134/saa7134-core.c:1215: error: `pending_registered' undeclared (first use in this function)
drivers/media/video/saa7134/saa7134-core.c:1215: error: (Each undeclared identifier is reported only once
drivers/media/video/saa7134/saa7134-core.c:1215: error: for each function it appears in.)
drivers/media/video/saa7134/saa7134-core.c:1216: error: `pending_notifier' undeclared (first use in this function)
make[4]: *** [drivers/media/video/saa7134/saa7134-core.o] Error 1

<--  snip  -->


This patch reverts this bogus patch.


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.12-mm1-modular/drivers/media/video/saa7134/saa7134-core.c	2005-06-20 10:59:33.000000000 +0200
+++ linux-2.6.12-mm1-full/drivers/media/video/saa7134/saa7134-core.c	2005-06-20 11:46:20.000000000 +0200
@@ -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);
 }
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/