1 files changed, 0 insertions, 27 deletions

diff --git a/linux/drivers/media/video/em28xx/em28xx-dvb.c b/linux/drivers/media/video/em28xx/em28xx-dvb.c
index c04e62739..b8a5c61ce 100644
--- a/linux/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/linux/drivers/media/video/em28xx/em28xx-dvb.c
@@ -63,11 +63,7 @@ struct em28xx_dvb {
 	int                        nfeeds;
 
 	/* general boilerplate stuff */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	struct dvb_adapter         adapter;
-#else
-	struct dvb_adapter         *adapter;
-#endif
 	struct dvb_demux           demux;
 	struct dmxdev              dmxdev;
 	struct dmx_frontend        fe_hw;
@@ -303,17 +299,10 @@ int register_dvb(struct em28xx_dvb *dvb,
 	/* Ensure all frontends negotiate bus access */
 	dvb->frontend->ops.ts_bus_ctrl = em28xx_dvb_bus_ctrl;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb->adapter.priv = dev;
 
 	/* register frontend */
 	result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
-#else
-	dvb->adapter->priv = dev;
-
-	/* register frontend */
-	result = dvb_register_frontend(dvb->adapter, dvb->frontend);
-#endif
 	if (result < 0) {
 		printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",
 		       dev->name, result);
@@ -340,11 +329,7 @@ int register_dvb(struct em28xx_dvb *dvb,
 	dvb->dmxdev.filternum    = 256;
 	dvb->dmxdev.demux        = &dvb->demux.dmx;
 	dvb->dmxdev.capabilities = 0;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
-#else
-	result = dvb_dmxdev_init(&dvb->dmxdev, dvb->adapter);
-#endif
 	if (result < 0) {
 		printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
 		       dev->name, result);
@@ -375,11 +360,7 @@ int register_dvb(struct em28xx_dvb *dvb,
 	}
 
 	/* register network adapter */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
-#else
-	dvb_net_init(dvb->adapter, &dvb->net, &dvb->demux.dmx);
-#endif
 	return 0;
 
 fail_fe_conn:
@@ -394,11 +375,7 @@ fail_dmx:
 	dvb_unregister_frontend(dvb->frontend);
 fail_frontend:
 	dvb_frontend_detach(dvb->frontend);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb_unregister_adapter(&dvb->adapter);
-#else
-	dvb_unregister_adapter(dvb->adapter);
-#endif
 fail_adapter:
 	return result;
 }
@@ -412,11 +389,7 @@ static void unregister_dvb(struct em28xx_dvb *dvb)
 	dvb_dmx_release(&dvb->demux);
 	dvb_unregister_frontend(dvb->frontend);
 	dvb_frontend_detach(dvb->frontend);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12))
 	dvb_unregister_adapter(&dvb->adapter);
-#else
-	dvb_unregister_adapter(dvb->adapter);
-#endif
 }