diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 18:07:06 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 18:07:06 +0000 |
| commit | 1c769dacd06c44528955753c2cac21b1d4b8ddef (patch) | |
| tree | cbd22854f18480a8054382799ade8c765ab618d1 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 15e9f7c5dda7607d5080c899de36fe6003e1318c (diff) | |
| download | mediapointer-dvb-s2-1c769dacd06c44528955753c2cac21b1d4b8ddef.tar.gz mediapointer-dvb-s2-1c769dacd06c44528955753c2cac21b1d4b8ddef.tar.bz2 | |
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
- Lots of small changes to allow compiling with kernel 2.4.
Compilation result not tested yet.
- After this patch, .version should be removed, since its
syntax has changed.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index 6c61550cb..aa5936b5a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-empress.c,v 1.12 2005/07/15 21:44:14 mchehab Exp $ + * $Id: saa7134-empress.c,v 1.13 2005/10/09 18:07:06 mchehab Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -30,11 +30,7 @@ #include "saa7134-reg.h" #include "saa7134.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,64) -#include "saa6752hs.h" -#else #include <media/saa6752hs.h> -#endif /* ------------------------------------------------------------------ */ @@ -42,7 +38,10 @@ MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); MODULE_LICENSE("GPL"); static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) +MODULE_PARM(empress_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i"); +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) static int dummy; module_param_array(empress_nr, int, dummy, 0444); #else |