Compiling linux-next gave this warning: drivers/media/usb/cx231xx/cx231xx-cards.c: In function ‘cx231xx_usb_probe’: drivers/media/usb/cx231xx/cx231xx-cards.c:1754:36: error: ‘struct cx231xx’ has no member named ‘media_dev’ retval = media_device_register(dev->media_dev); Looking at the refactoring in past two commits, following seems like a decent fix, i.e. to surround dev->media_dev by #ifdef CONFIG_MEDIA_CONTROLLER. Signed-off-by: Okash Khawaja <okash.khawaja@xxxxxxxxx> --- drivers/media/usb/cx231xx/cx231xx-cards.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 35692d1..220a5db 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1751,7 +1751,9 @@ static int cx231xx_usb_probe(struct usb_interface *interface, if (retval < 0) goto done; +#ifdef CONFIG_MEDIA_CONTROLLER retval = media_device_register(dev->media_dev); +#endif done: if (retval < 0) -- 2.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
