3.5.7.31 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Jones <davej@xxxxxxxxxxxxxxxxx> commit 13e1b87c986100169b0695aeb26970943665eda9 upstream. Fix the following build error: drivers/media/usb/dvb-usb-v2/ mxl111sf-tuner.h:72:9: error: expected ‘;’, ‘,’ or ‘)’ before ‘struct’ struct mxl111sf_tuner_config *cfg) Signed-off-by: Dave Jones <davej@xxxxxxxxxxxxxxxxx> Signed-off-by: Michael Krufky <mkrufky@xxxxxxxxxxx> Signed-off-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx> [ luis: backported to 3.5: - file rename: drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h -> drivers/media/dvb/dvb-usb/mxl111sf-tuner.h ] Signed-off-by: Luis Henriques <luis.henriques@xxxxxxxxxxxxx> --- drivers/media/dvb/dvb-usb/mxl111sf-tuner.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-tuner.h b/drivers/media/dvb/dvb-usb/mxl111sf-tuner.h index ff33396..10b93c4 100644 --- a/drivers/media/dvb/dvb-usb/mxl111sf-tuner.h +++ b/drivers/media/dvb/dvb-usb/mxl111sf-tuner.h @@ -69,7 +69,7 @@ struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe, #else static inline struct dvb_frontend *mxl111sf_tuner_attach(struct dvb_frontend *fe, - struct mxl111sf_state *mxl_state + struct mxl111sf_state *mxl_state, struct mxl111sf_tuner_config *cfg) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html