|
@@ -116,7 +116,7 @@ EXPORT_SYMBOL_GPL(viafb_irq_disable);
|
|
|
* most viafb systems will not need to have this extra code for a while.
|
|
|
* As soon as another user comes long, the ifdef can be removed.
|
|
|
*/
|
|
|
-#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA)
|
|
|
/*
|
|
|
* Access to the DMA engine. This currently provides what the camera
|
|
|
* driver needs (i.e. outgoing only) but is easily expandable if need
|
|
@@ -542,7 +542,7 @@ static struct viafb_subdev_info {
|
|
|
{
|
|
|
.name = "viafb-i2c",
|
|
|
},
|
|
|
-#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
|
|
|
+#if IS_ENABLED(CONFIG_VIDEO_VIA_CAMERA)
|
|
|
{
|
|
|
.name = "viafb-camera",
|
|
|
},
|