diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 18:16:47 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 18:16:47 +0200 |
| commit | 392ad50208a490ee5ee73ac59e809ad366019c00 (patch) | |
| tree | d984365ac21a1d8fd40a49f62781b7e6ae9a78df /linux/drivers/media/dvb/pluto2 | |
| parent | f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24 (diff) | |
| parent | 91263e7de241ee6403c43cd3a13206f749798ba6 (diff) | |
| download | mediapointer-dvb-s2-392ad50208a490ee5ee73ac59e809ad366019c00.tar.gz mediapointer-dvb-s2-392ad50208a490ee5ee73ac59e809ad366019c00.tar.bz2 | |
merge: from master
From: Patrick Boettcher <pb@linuxtv.org>
merge: from master
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/pluto2')
| -rw-r--r-- | linux/drivers/media/dvb/pluto2/Makefile | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/pluto2/pluto2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/pluto2/Makefile b/linux/drivers/media/dvb/pluto2/Makefile index 86ca84b2b..ce6a9aaf9 100644 --- a/linux/drivers/media/dvb/pluto2/Makefile +++ b/linux/drivers/media/dvb/pluto2/Makefile @@ -1,3 +1,3 @@ -obj-$(CONFIG_DVB_PLUTO2) = pluto2.o +obj-$(CONFIG_DVB_PLUTO2) += pluto2.o EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ diff --git a/linux/drivers/media/dvb/pluto2/pluto2.c b/linux/drivers/media/dvb/pluto2/pluto2.c index 1c5316e20..c9afad038 100644 --- a/linux/drivers/media/dvb/pluto2/pluto2.c +++ b/linux/drivers/media/dvb/pluto2/pluto2.c @@ -647,7 +647,7 @@ static int __devinit pluto2_probe(struct pci_dev *pdev, goto err_pluto_hw_exit; /* dvb */ - ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE); + ret = dvb_register_adapter(&pluto->dvb_adapter, DRIVER_NAME, THIS_MODULE, &pdev->dev); if (ret < 0) goto err_i2c_bit_del_bus; |