From 659e5d7238f9e926870c36d114a38abcbac8a8a0 Mon Sep 17 00:00:00 2001 From: Maykel Moya Date: Mon, 28 Apr 2008 19:20:26 -0300 Subject: [PATCH] --- yaml --- r: 192696 b: refs/heads/master c: 1b4c5b1f0582df9231e6e1093e504d7df3a062b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/tm6000/tm6000-dvb.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e477c87690f9..b300f9531c94 100644 --- 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 index fa6d3a00f9b0..6a4cbc5fcd93 100644 --- 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) {