diff options
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mic/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/misc/mic/bus/mic_bus.c | 1 | ||||
| -rw-r--r-- | drivers/misc/mic/bus/scif_bus.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mic/bus/scif_bus.h | 2 | ||||
| -rw-r--r-- | drivers/misc/mic/bus/vop_bus.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mic/host/mic_boot.c | 1 |
6 files changed, 6 insertions, 3 deletions
diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig index b9bb086785db..8a7c2c5711d5 100644 --- a/drivers/misc/mic/Kconfig +++ b/drivers/misc/mic/Kconfig @@ -35,6 +35,7 @@ config SCIF_BUS config VOP_BUS tristate "VOP Bus Driver" + depends on HAS_DMA select DMA_OPS help This option is selected by any driver which registers a diff --git a/drivers/misc/mic/bus/mic_bus.c b/drivers/misc/mic/bus/mic_bus.c index ed9a8351c3bf..a08cb29692a8 100644 --- a/drivers/misc/mic/bus/mic_bus.c +++ b/drivers/misc/mic/bus/mic_bus.c @@ -9,6 +9,7 @@ * This implementation is very similar to the the virtio bus driver * implementation @ drivers/virtio/virtio.c */ +#include <linux/dma-map-ops.h> #include <linux/slab.h> #include <linux/module.h> #include <linux/idr.h> diff --git a/drivers/misc/mic/bus/scif_bus.c b/drivers/misc/mic/bus/scif_bus.c index ae84109649d0..ad7c3604f151 100644 --- a/drivers/misc/mic/bus/scif_bus.c +++ b/drivers/misc/mic/bus/scif_bus.c @@ -9,7 +9,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/idr.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include "scif_bus.h" diff --git a/drivers/misc/mic/bus/scif_bus.h b/drivers/misc/mic/bus/scif_bus.h index 642cd43bcabc..4981eb56f879 100644 --- a/drivers/misc/mic/bus/scif_bus.h +++ b/drivers/misc/mic/bus/scif_bus.h @@ -12,7 +12,7 @@ * Everything a scif driver needs to work with any particular scif * hardware abstraction layer. */ -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include <linux/mic_common.h> #include "../common/mic_dev.h" diff --git a/drivers/misc/mic/bus/vop_bus.c b/drivers/misc/mic/bus/vop_bus.c index 3c865534868a..6935ddca1bd5 100644 --- a/drivers/misc/mic/bus/vop_bus.c +++ b/drivers/misc/mic/bus/vop_bus.c @@ -9,7 +9,7 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/idr.h> -#include <linux/dma-mapping.h> +#include <linux/dma-map-ops.h> #include "vop_bus.h" diff --git a/drivers/misc/mic/host/mic_boot.c b/drivers/misc/mic/host/mic_boot.c index fb5b3989753d..8cb85b8b3e19 100644 --- a/drivers/misc/mic/host/mic_boot.c +++ b/drivers/misc/mic/host/mic_boot.c @@ -10,6 +10,7 @@ #include <linux/firmware.h> #include <linux/pci.h> #include <linux/kmod.h> +#include <linux/dma-map-ops.h> #include <linux/mic_common.h> #include <linux/mic_bus.h> #include "../bus/scif_bus.h" |