diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-01 11:40:27 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-01 11:40:27 -0200 |
| commit | 40db5f952453121ccdf3ad610cb209984df4b1c0 (patch) | |
| tree | 8dae68b23f086de70c0a8b79dcb3f24dd6492159 /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | fd237d0264b616b7a22369b14e56952e2bc306c5 (diff) | |
| parent | 9fdaf8936ef6a151aed8baf835bf98716e2b33bf (diff) | |
| download | mediapointer-dvb-s2-40db5f952453121ccdf3ad610cb209984df4b1c0.tar.gz mediapointer-dvb-s2-40db5f952453121ccdf3ad610cb209984df4b1c0.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/fixes
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 1ba80210e..6e98c992c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -54,13 +54,9 @@ static unsigned int gpio_tracking; module_param(gpio_tracking, int, 0644); MODULE_PARM_DESC(gpio_tracking,"enable debug messages [gpio]"); -static unsigned int alsa; +static unsigned int alsa = 1; module_param(alsa, int, 0644); -MODULE_PARM_DESC(alsa,"enable ALSA DMA sound [dmasound]"); - -static unsigned int oss; -module_param(oss, int, 0644); -MODULE_PARM_DESC(oss,"enable OSS DMA sound [dmasound]"); +MODULE_PARM_DESC(alsa,"enable/disable ALSA DMA sound [dmasound]"); static unsigned int latency = UNSET; module_param(latency, int, 0444); @@ -201,10 +197,10 @@ static void request_module_async(struct work_struct *work){ request_module("saa7134-empress"); if (card_is_dvb(dev)) request_module("saa7134-dvb"); - if (alsa) - request_module("saa7134-alsa"); - if (oss) - request_module("saa7134-oss"); + if (alsa) { + if (dev->pci->device != PCI_DEVICE_ID_PHILIPS_SAA7130) + request_module("saa7134-alsa"); + } } static void request_submodules(struct saa7134_dev *dev) |