Merge tag 'tty-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[deliverable/linux.git] / drivers / power / goldfish_battery.c

diff --git a/drivers/power/goldfish_battery.c b/drivers/power/goldfish_battery.c
index 7510796e190c23d49086fd9a2b34fd9c83dbafed..f5c525e4482a18b533ad80c09b1e8a7da8be06a8 100644 (file)
--- a/drivers/power/goldfish_battery.c
+++ b/drivers/power/goldfish_battery.c
@@ -24,6 +24,7 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/acpi.h>
 
 struct goldfish_battery_data {
        void __iomem *reg_base;
@@ -233,12 +234,19 @@ static const struct of_device_id goldfish_battery_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, goldfish_battery_of_match);
 
+static const struct acpi_device_id goldfish_battery_acpi_match[] = {
+       { "GFSH0001", 0 },
+       { },
+};
+MODULE_DEVICE_TABLE(acpi, goldfish_battery_acpi_match);
+
 static struct platform_driver goldfish_battery_device = {
        .probe          = goldfish_battery_probe,
        .remove         = goldfish_battery_remove,
        .driver = {
                .name = "goldfish-battery",
                .of_match_table = goldfish_battery_of_match,
+               .acpi_match_table = ACPI_PTR(goldfish_battery_acpi_match),
        }
 };
 module_platform_driver(goldfish_battery_device);