diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index ea48bb5b4af0..b0f886e27c60 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -54,9 +54,9 @@ static unsigned int gpio_tracking; | |||
54 | module_param(gpio_tracking, int, 0644); | 54 | module_param(gpio_tracking, int, 0644); |
55 | MODULE_PARM_DESC(gpio_tracking,"enable debug messages [gpio]"); | 55 | MODULE_PARM_DESC(gpio_tracking,"enable debug messages [gpio]"); |
56 | 56 | ||
57 | static unsigned int alsa; | 57 | static unsigned int alsa = 1; |
58 | module_param(alsa, int, 0644); | 58 | module_param(alsa, int, 0644); |
59 | MODULE_PARM_DESC(alsa,"enable ALSA DMA sound [dmasound]"); | 59 | MODULE_PARM_DESC(alsa,"enable/disable ALSA DMA sound [dmasound]"); |
60 | 60 | ||
61 | static unsigned int latency = UNSET; | 61 | static unsigned int latency = UNSET; |
62 | module_param(latency, int, 0444); | 62 | module_param(latency, int, 0444); |
@@ -152,8 +152,10 @@ static void request_module_async(struct work_struct *work){ | |||
152 | request_module("saa7134-empress"); | 152 | request_module("saa7134-empress"); |
153 | if (card_is_dvb(dev)) | 153 | if (card_is_dvb(dev)) |
154 | request_module("saa7134-dvb"); | 154 | request_module("saa7134-dvb"); |
155 | if (alsa) | 155 | if (alsa) { |
156 | request_module("saa7134-alsa"); | 156 | if (dev->pci->device != PCI_DEVICE_ID_PHILIPS_SAA7130) |
157 | request_module("saa7134-alsa"); | ||
158 | } | ||
157 | } | 159 | } |
158 | 160 | ||
159 | static void request_submodules(struct saa7134_dev *dev) | 161 | static void request_submodules(struct saa7134_dev *dev) |