Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
---
drivers/media/dvb/firesat/firesat.h | 8 --------
drivers/media/dvb/firesat/firesat_dvb.c | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
Index: linux/drivers/media/dvb/firesat/firesat.h
===================================================================
--- linux.orig/drivers/media/dvb/firesat/firesat.h
+++ linux/drivers/media/dvb/firesat/firesat.h
@@ -28,14 +28,6 @@
#include <dvb_net.h>
#include <dvbdev.h>
-#include <linux/version.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
-#define DVB_REGISTER_ADAPTER(x, y, z, w, v) dvb_register_adapter(x, y, z, w, v)
-#else
-#define DVB_REGISTER_ADAPTER(x, y, z, w, v) dvb_register_adapter(x, y, z, w)
-#define DVB_DEFINE_MOD_OPT_ADAPTER_NR(x)
-#endif
-
/*****************************************************************
* CA message command constants from en50221_app_tags.h of libdvb
*****************************************************************/
Index: linux/drivers/media/dvb/firesat/firesat_dvb.c
===================================================================
--- linux.orig/drivers/media/dvb/firesat/firesat_dvb.c
+++ linux/drivers/media/dvb/firesat/firesat_dvb.c
@@ -218,7 +218,7 @@ int firesat_dvbdev_init(struct firesat *
return -ENOMEM;
}
- result = DVB_REGISTER_ADAPTER(firesat->adapter,
+ result = dvb_register_adapter(firesat->adapter,
firedtv_model_names[firesat->type],
THIS_MODULE, dev, adapter_nr);
if (result < 0) {
--
Stefan Richter
-=====-==--- =--- ==---
http://arcgraph.de/sr/
