Pull ec into test branch

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 4a909bfb805cff49387cf1ef71f9efb6da63d569..08c12588af6910cf98d236823463dc8fb105eb01 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -92,7 +92,7 @@ static struct acpi_driver acpi_ec_driver = {
 };
 
 /* If we find an EC via the ECDT, we need to keep a ptr to its context */
-struct acpi_ec {
+static struct acpi_ec {
        acpi_handle handle;
        unsigned long uid;
        unsigned long gpe;