diff options
| author | Johannes Stezenbach <js@linuxtv.org> | 2005-03-28 04:20:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-28 04:20:33 -0800 |
| commit | 2bc197802f9758a8787885d23e3e131b11051333 (patch) | |
| tree | b5c7abd04ccfb5fbd799b916f4cc3f960ff694ea | |
| parent | ca7751b684b227a416f53e2b462df1d479d3fc4c (diff) | |
| download | history-2bc197802f9758a8787885d23e3e131b11051333.tar.gz | |
[PATCH] dvb: dibusb: remove useless ifdef
removed useless ifdef: dvb_register_adapter always takes 3 parameters in this tree
(Andreas Oberritter)
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/media/dvb/dibusb/dvb-dibusb-dvb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c b/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c index 17b2a2f6ef3de..f71e160073c1b 100644 --- a/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c +++ b/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c @@ -125,12 +125,8 @@ int dibusb_dvb_init(struct usb_dibusb *dib) urb_compl_count = 0; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,4) - if ((ret = dvb_register_adapter(&dib->adapter, DRIVER_DESC)) < 0) { -#else - if ((ret = dvb_register_adapter(&dib->adapter, DRIVER_DESC , + if ((ret = dvb_register_adapter(&dib->adapter, DRIVER_DESC, THIS_MODULE)) < 0) { -#endif deb_info("dvb_register_adapter failed: error %d", ret); goto err; } |