summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/virtio/virtio_mmio.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/virtio/virtio_mmio.c')
-rw-r--r--kernel/drivers/virtio/virtio_mmio.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel/drivers/virtio/virtio_mmio.c b/kernel/drivers/virtio/virtio_mmio.c
index 7a5e60dea..f499d9da7 100644
--- a/kernel/drivers/virtio/virtio_mmio.c
+++ b/kernel/drivers/virtio/virtio_mmio.c
@@ -58,6 +58,7 @@
#define pr_fmt(fmt) "virtio-mmio: " fmt
+#include <linux/acpi.h>
#include <linux/highmem.h>
#include <linux/interrupt.h>
#include <linux/io.h>
@@ -691,7 +692,7 @@ static int vm_cmdline_get(char *buffer, const struct kernel_param *kp)
return strlen(buffer) + 1;
}
-static struct kernel_param_ops vm_cmdline_param_ops = {
+static const struct kernel_param_ops vm_cmdline_param_ops = {
.set = vm_cmdline_set,
.get = vm_cmdline_get,
};
@@ -732,12 +733,21 @@ static struct of_device_id virtio_mmio_match[] = {
};
MODULE_DEVICE_TABLE(of, virtio_mmio_match);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id virtio_mmio_acpi_match[] = {
+ { "LNRO0005", },
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, virtio_mmio_acpi_match);
+#endif
+
static struct platform_driver virtio_mmio_driver = {
.probe = virtio_mmio_probe,
.remove = virtio_mmio_remove,
.driver = {
.name = "virtio-mmio",
.of_match_table = virtio_mmio_match,
+ .acpi_match_table = ACPI_PTR(virtio_mmio_acpi_match),
},
};