diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 8f2eba0fd..3f81aac46 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.32 2005/06/16 23:00:22 hhackmann Exp $ + * $Id: saa7134-core.c,v 1.33 2005/06/20 22:06:52 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -1291,8 +1291,10 @@ static int saa7134_init(void) static void saa7134_fini(void) { +#ifdef CONFIG_MODULES if (pending_registered) unregister_module_notifier(&pending_notifier); +#endif pci_unregister_driver(&saa7134_pci_driver); } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ebed47098..5dd3538be 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-06-20 18:04 mkrufky + * saa7134-core.c: + - Fix kernel compile error with CONFIG_MODULES=n + + Signed-off-by: Adrian Bunk <bunk@stusta.de> + 2005-06-20 14:14 mkrufky * lgdt3302.c: - Change lgdt3302 driver to return raw data for SNR. |