linux/acpi.h already does the correct thing when CONFIG_ACPI is not set so there is no need to wrap it in #ifdef CONFIG_ACPI and in fact this stops ACPI_PTR() working in the non ACPI case.
Signed-off-by: Graeme Gregory graeme.gregory@linaro.org --- drivers/virtio/virtio_mmio.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 1bf6bad..81d539f 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -100,10 +100,7 @@ #include <linux/virtio_config.h> #include <linux/virtio_mmio.h> #include <linux/virtio_ring.h> - -#ifdef CONFIG_ACPI #include <linux/acpi.h> -#endif
/* The alignment to use between consumer and producer parts of vring. * Currently hardcoded to the page size. */