diff options
| author | Reimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de> | 2005-12-01 00:51:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:48:58 -0800 |
| commit | fd1eab73d50258b4c622b8dc23d896abd5cff2e6 (patch) | |
| tree | e770702e5119803503f6c13dfd071169cbd3f308 | |
| parent | 1bcd2a36711e6a72802a92a4e3fcef9d0c59dc3f (diff) | |
| download | lwn-fd1eab73d50258b4c622b8dc23d896abd5cff2e6.tar.gz lwn-fd1eab73d50258b4c622b8dc23d896abd5cff2e6.zip | |
[PATCH] V4L: Fix crash when not compiled as module
Fix crash when not compiled as module.
Signed-off-by: Reimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 0aca7229f3ce..1a093bf176f3 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c @@ -187,8 +187,7 @@ void saa7134_track_gpio(struct saa7134_dev *dev, char *msg) /* ----------------------------------------------------------- */ /* delayed request_module */ -#ifdef CONFIG_MODULES - +#if defined(CONFIG_MODULES) && defined(MODULE) static int need_empress; static int need_dvb; static int need_alsa; @@ -237,9 +236,7 @@ static void request_module_depend(char *name, int *flag) } #else - #define request_module_depend(name,flag) - #endif /* CONFIG_MODULES */ /* ------------------------------------------------------------------ */ @@ -1163,10 +1160,10 @@ static int saa7134_init(void) static void saa7134_fini(void) { -#ifdef CONFIG_MODULES +#if defined(CONFIG_MODULES) && defined(MODULE) if (pending_registered) unregister_module_notifier(&pending_notifier); -#endif +#endif /* CONFIG_MODULES */ pci_unregister_driver(&saa7134_pci_driver); } |