---

yaml --- r: 192696 b: refs/heads/master c: 1b4c5b1 h: refs/heads/master v: v3
git-mirror · May 18, 2010 · 659e5d7 · 659e5d7
1 parent 75bde45
commit 659e5d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed0236afa2382e1b75fec2a080a1e11ff1909de1
+refs/heads/master: 1b4c5b1f0582df9231e6e1093e504d7df3a062b9
diff --git a/trunk/drivers/staging/tm6000/tm6000-dvb.c b/trunk/drivers/staging/tm6000/tm6000-dvb.c
@@ -208,6 +208,8 @@ int tm6000_dvb_attach_frontend(struct tm6000_core *dev)
 	return (!dvb->frontend) ? -1 : 0;
 }
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 int tm6000_dvb_register(struct tm6000_core *dev)
 {
 	int ret = -1;
@@ -225,7 +227,7 @@ int tm6000_dvb_register(struct tm6000_core *dev)
 	}
 
 	ret = dvb_register_adapter(&dvb->adapter, "Trident TVMaster 6000 DVB-T",
-							  THIS_MODULE, &dev->udev->dev);
+							  THIS_MODULE, &dev->udev->dev, adapter_nr);
 	dvb->adapter.priv = dev;
 
 	if (dvb->frontend) {