diff options
| author | Gerd Knorr <devnull@localhost> | 2005-01-24 17:37:23 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-01-24 17:37:23 +0000 |
| commit | 588d0f9cc7aa0863fe8e84e16aa98e847e6d214d (patch) | |
| tree | 998678a36f1672304670bfc08d4d9dd625a5f5aa /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | 798aea71fd4046e8f2673d896b058eb0cac8298c (diff) | |
| download | mediapointer-dvb-s2-588d0f9cc7aa0863fe8e84e16aa98e847e6d214d.tar.gz mediapointer-dvb-s2-588d0f9cc7aa0863fe8e84e16aa98e847e6d214d.tar.bz2 | |
- sync with 2.6.11-rc2 & latest dvb cvs.
- misc card-specific tweaks.
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 0acbfb094..80f33e987 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.23 2004/12/17 14:18:49 kraxel Exp $ + * $Id: saa7134-core.c,v 1.24 2005/01/24 17:37:23 kraxel Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -21,6 +21,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <linux/config.h> #include <linux/init.h> #include <linux/list.h> #include <linux/module.h> @@ -237,6 +238,8 @@ static void dump_statusregs(struct saa7134_dev *dev) /* ----------------------------------------------------------- */ /* delayed request_module */ +#ifdef CONFIG_MODULES + static int need_empress; static int need_dvb; @@ -277,6 +280,12 @@ static void request_module_depend(char *name, int *flag) } } +#else + +static inline void request_module_depend(char *name, int *flag) {} + +#endif /* CONFIG_MODULES */ + /* ------------------------------------------------------------------ */ /* nr of (saa7134-)pages for the given buffer size */ |