---

yaml --- r: 137800 b: refs/heads/master c: 74d200f h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 9c6b0ad · 9c6b0ad
1 parent c25a6fb
commit 9c6b0ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaf50d7d0e12ec797dc0677c4fc853839bdcf07d
+refs/heads/master: 74d200f13156f7057ed62ecca086be75cdf363d5
diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c
@@ -58,10 +58,6 @@ static unsigned int alsa;
 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]");
-
 static unsigned int latency = UNSET;
 module_param(latency, int, 0444);
 MODULE_PARM_DESC(latency,"pci latency timer");
@@ -158,8 +154,6 @@ static void request_module_async(struct work_struct *work){
 		request_module("saa7134-dvb");
 	if (alsa)
 		request_module("saa7134-alsa");
-	if (oss)
-		request_module("saa7134-oss");
 }
 
 static void request_submodules(struct saa7134_dev *dev)