Merge tag 'driver-core-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / internal.h

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index c31787bef2d323145f38b6a5b6884713a953df20..11d87bf67e738ce7e7a07541993b92bbb66e423a 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -138,7 +138,7 @@ struct acpi_ec {
        unsigned long gpe;
        unsigned long command_addr;
        unsigned long data_addr;
-       unsigned long global_lock;
+       bool global_lock;
        unsigned long flags;
        unsigned long reference_count;
        struct mutex mutex;