@@ -689,7 +689,11 @@ error:
static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ adap->fe_adap[0].fe = rtl2832u_fe_attach(adap->dev);
+#else
adap->fe = rtl2832u_fe_attach(adap->dev);
+#endif
return 0;
}
@@ -835,9 +839,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -852,6 +863,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
@@ -917,9 +931,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -934,6 +955,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
//remote control
@@ -999,9 +1023,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -1016,6 +1047,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
@@ -1087,9 +1121,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -1104,6 +1145,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
//remote control
@@ -1176,9 +1220,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -1193,6 +1244,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
//remote control
@@ -1265,9 +1319,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -1282,6 +1343,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
/*remote control*/
@@ -1353,9 +1417,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -1370,6 +1441,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
//remote control
@@ -1436,9 +1510,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -1453,6 +1534,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
//remote control
@@ -1519,9 +1603,16 @@ static struct dvb_usb_device_properties
.adapter =
{
{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ .fe_ioctl_override = rtl2832u_ioctl_override,
+ .num_frontends = 1,
+ .fe = {{
+#endif
.streaming_ctrl = rtl2832u_streaming_ctrl,
.frontend_attach = rtl2832u_frontend_attach,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0)
.fe_ioctl_override = rtl2832u_ioctl_override,
+#endif
//parameter for the MPEG2-data transfer
.stream =
{
@@ -1536,6 +1627,9 @@ static struct dvb_usb_device_properties
}
}
},
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ }},
+#endif
}
},
//remote control